50 files changed, 24903 insertions, 23098 deletions

diff --git a/ChangeLog b/ChangeLog
index 5303f3544..94c604d3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-31  Werner Koch  <[email protected]>
+
+	Released 2.0.2.
+
 2006-11-30  Werner Koch  <[email protected]>
 
 	* configure.ac: Save original LIBS when testing for dlopen.
diff --git a/NEWS b/NEWS
index af8ecf3b3..64e9bbd97 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 2.0.2 (unreleased)
+Noteworthy changes in version 2.0.2 (2007-01-31)
 ------------------------------------------------
 
  * Fixed a serious and exploitable bug in processing encrypted
@@ -8,12 +8,12 @@ Noteworthy changes in version 2.0.2 (unreleased)
    prompt for a new passphrase to be repeated.  This is useful to help
    memorize a new passphrase.  The default is 1 repetition.
 
- * Using a PIN pad does now also for for the signing key.
+ * Using a PIN pad does now also work for the signing key.
 
- * A warning is displayed if a new passphrase is too short.  New
-   option --min-passphrase-len defaults to 8.
+ * A warning is displayed bu gpg-agent if a new passphrase is too
+   short.  New option --min-passphrase-len defaults to 8.
 
- * The status code BEGIN_SIGNING now show the used hash algorithm.
+ * The status code BEGIN_SIGNING now shows the used hash algorithms.
  
 
 Noteworthy changes in version 2.0.1 (2006-11-28)
diff --git a/THANKS b/THANKS
index aa68f22f6..20e2bdc79 100644
--- a/THANKS
+++ b/THANKS
@@ -232,6 +232,7 @@ Timo Schulz                twoaday at freakmail.de
 Tobias Winkler             tobias.winkler at s1998.tu-chemnitz.de
 Todd Vierling              tv at pobox.com
 TOGAWA Satoshi             Satoshi.Togawa at jp.yokogawa.com
+Tom Duerbusch              DuerbuschT at stlouiscity.com
 Tom Spindler		   dogcow at home.merit.edu
 Tom Zerucha		   tzeruch at ceddec.com
 Tomas Fasth		   tomas.fasth at twinspot.net
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 39f02b115..86f4569a0 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-31  Werner Koch  <[email protected]>
+
+	* Makefile.am (t_common_ldadd): Add LIBICONV.
+
 2007-01-25  Werner Koch  <[email protected]>
 
 	* genkey.c (check_passphrase_constraints): Get ngettext call right
diff --git a/agent/Makefile.am b/agent/Makefile.am
index 6ec0068ca..b79423a7c 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -83,7 +83,7 @@ $(PROGRAMS): $(common_libs) $(commonpth_libs) $(pwquery_libs)
 TESTS = t-protect
 
 t_common_ldadd = $(common_libs) \
-                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
+                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
 
 t_protect_SOURCES = t-protect.c protect.c 
 t_protect_LDADD = $(t_common_ldadd)
diff --git a/common/ChangeLog b/common/ChangeLog
index 5369d9f32..aa221f1ee 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-31  Werner Koch  <[email protected]>
+
+	* Makefile.am (t_common_ldadd): Add LIBINCONV and LIBINTL.
+
 2007-01-25  Werner Koch  <[email protected]>
 
 	* simple-pwquery.c (simple_pwquery): New arg OPT_CHECK.
diff --git a/common/Makefile.am b/common/Makefile.am
index f2b28c45c..a0b27a12c 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -79,7 +79,7 @@ libgpgrl_a_SOURCES = \
 module_tests = t-convert
 
 t_common_ldadd = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
-                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
+                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
 
 t_convert_DEPENDENCIES = convert.c libcommon.a
 t_convert_LDADD = $(t_common_ldadd)
diff --git a/configure.ac b/configure.ac
index bfe4fe81f..1a53023a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.9.3"
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 m4_define([my_version], [2.0.2])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
diff --git a/doc/com-certs.pem b/doc/com-certs.pem
index 60394fd3a..3ec11bca4 100644
--- a/doc/com-certs.pem
+++ b/doc/com-certs.pem
@@ -318,27 +318,28 @@ Subject ..: /CN=S-TRUST Qualified Root CA 2007-001:PN
 # Currently disabled because latest SVN versions of libgcrypt and
 # libksba a required to use this certificate.
 #-----BEGIN CERTIFICATE-----
-#MIIESzCCAzOgAwIBAgIRALwJjgQC6SlWuNfedJd+JvcwDQYJKoZIhvcNAQELBQAw
-#gZ4xCzAJBgNVBAYTAkRFMSAwHgYDVQQIExdCYWRlbi1XdWVydHRlbWJlcmcgKEJX
-#KTESMBAGA1UEBxMJU3R1dHRnYXJ0MSkwJwYDVQQKEyBEZXV0c2NoZXIgU3Bhcmth
-#c3NlbiBWZXJsYWcgR21iSDEuMCwGA1UEAxMlUy1UUlVTVCBRdWFsaWZpZWQgUm9v
-#dCBDQSAyMDA3LTAwMTpQTjAeFw0wNzAxMDEwMDAwMDBaFw0xMTEyMzAyMzU5NTla
-#MIGeMQswCQYDVQQGEwJERTEgMB4GA1UECBMXQmFkZW4tV3VlcnR0ZW1iZXJnIChC
-#VykxEjAQBgNVBAcTCVN0dXR0Z2FydDEpMCcGA1UEChMgRGV1dHNjaGVyIFNwYXJr
-#YXNzZW4gVmVybGFnIEdtYkgxLjAsBgNVBAMTJVMtVFJVU1QgUXVhbGlmaWVkIFJv
-#b3QgQ0EgMjAwNy0wMDE6UE4wggEjMA0GCSqGSIb3DQEBAQUAA4IBEAAwggELAoIB
-#AQCnJdNNiDQLKpPIfHTC3ifleXWTf96hLfvP58q41fuywQ+rXju453yjPgr/ej5i
-#RgYPyJnSc498wyu/XtPLIC3gQvowfiI8WmSj/eEToHUhrLIAtx1VXSi/Rugt3E1Y
-#uYGkPn/gnrkk+RtPJQuBl1NRxKEVi7rg1Ch5RJvWsUTOmxgeWlr8qZnPoLkA2y6N
-#lhL6LP3Th+OQIH4RFFfazNYWpH4Cg6I5nzyieHaR6LrGk0L7GfDKdZG4Eqan3JvI
-#ilrFHzzCm7qudd+31jcRamReqZqJ0wzBmY1LNAzDyCAC3Y+YWEz8crhDW3mK/wFY
-#H0RHHeow06RMTEVwls+FrhWfAgRAAACBo4GAMH4wEgYDVR0TAQH/BAgwBgEB/wIB
-#ATAOBgNVHQ8BAf8EBAMCAQYwGAYIKwYBBQUHAQMEDDAKMAgGBgQAjkYBATAdBgNV
-#HQ4EFgQUPAujGBtjPCldr0A+EM4YCZSIX1cwHwYDVR0jBBgwFoAUPAujGBtjPCld
-#r0A+EM4YCZSIX1cwDQYJKoZIhvcNAQELBQADggEBAJ1pVXXcVb9m0yRPjvE4Rvko
-#tdjIm29YnY13ILCrPqjfgtpSlId6NHPhykGLkw3ratNlWQp3rmen/8EqQJa0rsPD
-#CiB20ilLb1CmF8/SViJ26C+K0ayzk8s2v7S/m7/Tx9Dgd2PXWwy2XjeGG/2SkISH
-#5CtSjbm8U+xTh5SQMgK1MX/bDiNJebDOO0N2lxAjtcGmw7K6OTWS7KnFfjzv6fKK
-#L7Ed2Gpd2gBkbuJVe/wX2mDP2P4rpcCEkXrDoWbi9WWc+eP5fCgE4Nj7/VhnbPf6
-#DJCvmUG571uf1oukFaoeeyzpw2q28Ly1KR8DNPw+B/3PzJUIjXYzPGyUjv3aPew=
+MIIESzCCAzOgAwIBAgIRALwJjgQC6SlWuNfedJd+JvcwDQYJKoZIhvcNAQELBQAw
+gZ4xCzAJBgNVBAYTAkRFMSAwHgYDVQQIExdCYWRlbi1XdWVydHRlbWJlcmcgKEJX
+KTESMBAGA1UEBxMJU3R1dHRnYXJ0MSkwJwYDVQQKEyBEZXV0c2NoZXIgU3Bhcmth
+c3NlbiBWZXJsYWcgR21iSDEuMCwGA1UEAxMlUy1UUlVTVCBRdWFsaWZpZWQgUm9v
+dCBDQSAyMDA3LTAwMTpQTjAeFw0wNzAxMDEwMDAwMDBaFw0xMTEyMzAyMzU5NTla
+MIGeMQswCQYDVQQGEwJERTEgMB4GA1UECBMXQmFkZW4tV3VlcnR0ZW1iZXJnIChC
+VykxEjAQBgNVBAcTCVN0dXR0Z2FydDEpMCcGA1UEChMgRGV1dHNjaGVyIFNwYXJr
+YXNzZW4gVmVybGFnIEdtYkgxLjAsBgNVBAMTJVMtVFJVU1QgUXVhbGlmaWVkIFJv
+b3QgQ0EgMjAwNy0wMDE6UE4wggEjMA0GCSqGSIb3DQEBAQUAA4IBEAAwggELAoIB
+AQCnJdNNiDQLKpPIfHTC3ifleXWTf96hLfvP58q41fuywQ+rXju453yjPgr/ej5i
+RgYPyJnSc498wyu/XtPLIC3gQvowfiI8WmSj/eEToHUhrLIAtx1VXSi/Rugt3E1Y
+uYGkPn/gnrkk+RtPJQuBl1NRxKEVi7rg1Ch5RJvWsUTOmxgeWlr8qZnPoLkA2y6N
+lhL6LP3Th+OQIH4RFFfazNYWpH4Cg6I5nzyieHaR6LrGk0L7GfDKdZG4Eqan3JvI
+ilrFHzzCm7qudd+31jcRamReqZqJ0wzBmY1LNAzDyCAC3Y+YWEz8crhDW3mK/wFY
+H0RHHeow06RMTEVwls+FrhWfAgRAAACBo4GAMH4wEgYDVR0TAQH/BAgwBgEB/wIB
+ATAOBgNVHQ8BAf8EBAMCAQYwGAYIKwYBBQUHAQMEDDAKMAgGBgQAjkYBATAdBgNV
+HQ4EFgQUPAujGBtjPCldr0A+EM4YCZSIX1cwHwYDVR0jBBgwFoAUPAujGBtjPCld
+r0A+EM4YCZSIX1cwDQYJKoZIhvcNAQELBQADggEBAJ1pVXXcVb9m0yRPjvE4Rvko
+tdjIm29YnY13ILCrPqjfgtpSlId6NHPhykGLkw3ratNlWQp3rmen/8EqQJa0rsPD
+CiB20ilLb1CmF8/SViJ26C+K0ayzk8s2v7S/m7/Tx9Dgd2PXWwy2XjeGG/2SkISH
+5CtSjbm8U+xTh5SQMgK1MX/bDiNJebDOO0N2lxAjtcGmw7K6OTWS7KnFfjzv6fKK
+L7Ed2Gpd2gBkbuJVe/wX2mDP2P4rpcCEkXrDoWbi9WWc+eP5fCgE4Nj7/VhnbPf6
+DJCvmUG571uf1oukFaoeeyzpw2q28Ly1KR8DNPw+B/3PzJUIjXYzPGyUjv3aPew=
 #-----END CERTIFICATE-----
+
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 0c029c2a5..f5cc84e7e 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1463,7 +1463,7 @@ Override the value of the environment variable
 @samp{GPG_AGENT_INFO}. This is only used when @option{--use-agent} has
 been given.  Given that this option is not anymore used by
 @command{gpg2}, it should be avoided if possible.
-@end gpgone
+@end ifset
 
 @item --lock-once
 Lock the databases the first time a lock is requested
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 49208d5d2..9df760c69 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -164,7 +164,8 @@ use @samp{--help} to get a list of supported operations.
 @table @gnupgtabopt
 @item --gen-key
 @opindex gen-key
-Generate a new key and a certificate request.
+This command will only print an error message and direct the user to the
+@command{gpgsm-gencert.sh} script.
 
 @item --list-keys
 @itemx -k 
diff --git a/doc/qualified.txt b/doc/qualified.txt
index 083550734..f6a54d66e 100644
--- a/doc/qualified.txt
+++ b/doc/qualified.txt
@@ -13,7 +13,8 @@
 # property with its OpenPGP signature.  Check this signature before
 # adding entries:
 #  svn pg gpg:signature qualified.txt | gpg --verify - qualified.txt
-
+# to create a new signature:
+#  f=qualified.txt; gpg -sba $f && svn ps gpg:signature -F $f.asc $f
 
 #*******************************************
 #
@@ -108,6 +109,79 @@ DB:45:3D:1B:B0:1A:F3:23:10:6B:DE:D0:09:61:57:AA:F4:25:E0:5B  de
 A0:8B:DF:3B:AA:EE:3F:9D:64:6C:47:81:23:21:D4:A6:18:81:67:1D  de
 
 
+#
+# D-Trust root certificates.  Probably by shifting a lot of Euros to
+# laywer companies, German CAs achieved to get the permission to
+# create their own legally binding root certificates - independent of
+# the Bundesnetzagentur.  The main problem with this is that it is
+# hard to figure out what qualified root certificates are actually
+# active.  There is now no way to be sure whether a signature is a
+# qualified one.  A pettifogger's way of validating certificates.
+#
+
+#Serial number: 00B95F
+#       Issuer: /CN=D-TRUST Qualified Root CA 1 2006:PN/O=D-Trust GmbH/C=DE
+#      Subject: /CN=D-TRUST Qualified Root CA 1 2006:PN/O=D-Trust GmbH/C=DE
+#          aka: [email protected]
+#          aka: (uri http://www.d-trust.net)
+#     validity: 2006-04-27 12:40:54 through 2011-04-27 12:40:54
+#     key type: 2048 bit RSA
+#    key usage: certSign crlSign
+#     policies: 1.3.6.1.4.1.4788.2.30.1:N:
+# chain length: unlimited
+#[checked: 2007-01-31  by phone 030-259391-0 and callback by Mrs. Enke]
+E0:BF:1B:91:91:6B:88:E4:F1:15:92:22:CE:37:23:96:B1:4A:2E:5C  de
+
+
+#Serial number: 00B960
+#       Issuer: /CN=D-TRUST Qualified Root CA 2 2006:PN/O=D-Trust GmbH/C=DE
+#      Subject: /CN=D-TRUST Qualified Root CA 2 2006:PN/O=D-Trust GmbH/C=DE
+#          aka: [email protected]
+#          aka: (uri http://www.d-trust.net)
+#     validity: 2006-04-27 12:40:54 through 2011-04-27 12:40:54
+#     key type: 2048 bit RSA
+#    key usage: certSign crlSign
+#     policies: 1.3.6.1.4.1.4788.2.30.1:N:
+# chain length: unlimited
+#[checked: 2007-01-31  by phone 030-259391-0 and callback by Mrs. Enke]
+98:2A:75:67:0F:F8:28:4A:94:E0:9D:23:D8:E7:62:C8:BD:A4:54:04  de
+
+
+#
+# S-Trust root certificates.
+#
+
+#Serial number: 00DF749F80AA51F0EDC0CB1FC183E97EE2
+#       Issuer: /CN=S-TRUST Qualified Root CA 2006-001:PN
+#               /O=Deutscher Sparkassen Verlag GmbH/L=Stuttgart
+#               /ST=Baden-Wuerttemberg (BW)/C=DE
+#      Subject: /CN=S-TRUST Qualified Root CA 2006-001:PN
+#               /O=Deutscher Sparkassen Verlag GmbH/L=Stuttgart
+#               /ST=Baden-Wuerttemberg (BW)/C=DE
+#     validity: 2006-01-01 00:00:00 through 2010-12-30 23:59:59
+#     key type: 2048 bit RSA
+#    key usage: certSign crlSign
+# chain length: 1
+#[checked: 2007-01-31 by phone 0711-782-0 Mr. Brommer]
+7D:DC:76:1C:FD:AF:4C:E0:3A:B5:3A:DD:C9:FA:13:35:19:A3:DE:C9  de
+
+#Serial number: 00BC098E0402E92956B8D7DE74977E26F7
+#       Issuer: /CN=S-TRUST Qualified Root CA 2007-001:PN
+#               /O=Deutscher Sparkassen Verlag GmbH/L=Stuttgart
+#               /ST=Baden-Wuerttemberg (BW)/C=DE
+#      Subject: /CN=S-TRUST Qualified Root CA 2007-001:PN
+#               /O=Deutscher Sparkassen Verlag GmbH/L=Stuttgart
+#               /ST=Baden-Wuerttemberg (BW)/C=DE
+#     validity: 2007-01-01 00:00:00 through 2011-12-30 23:59:59
+#     key type: 2048 bit RSA
+#    key usage: certSign crlSign
+# chain length: 1
+#[checked: 2007-01-31 by phone 0711-782-0 Mr. Brommer]
+7A:3C:1B:60:2E:BD:A4:A1:E0:EB:AD:7A:BA:4F:D1:43:69:A9:39:FC  de
+
+
+
+
 #*******************************************
 #
 #                 End of file
diff --git a/g10/ChangeLog b/g10/ChangeLog
index e5bc8e837..6c8148e60 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-31  Werner Koch  <[email protected]>
+
+	* passphrase.c (passphrase_get): Set the cancel flag on all error
+	from the agent.  Fixes a bug reported by Tom Duerbusch.
+
 2007-01-30  Werner Koch  <[email protected]>
 
 	* status.c (write_status_begin_signing): New.
diff --git a/g10/keygen.c b/g10/keygen.c
index 2db4ab210..2adb4cc01 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2446,9 +2446,9 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
   /* make DEK and S2K from the Passphrase */
   r = get_parameter( para, pPASSPHRASE );
   if( r && *r->u.value ) {
-    /* we have a plain text passphrase - create a DEK from it.
+    /* We have a plain text passphrase - create a DEK from it.
      * It is a little bit ridiculous to keep it ih secure memory
-     * but becuase we do this alwasy, why not here */
+     * but because we do this always, why not here */
     STRING2KEY *s2k;
     DEK *dek;
 
diff --git a/g10/passphrase.c b/g10/passphrase.c
index f4015ef74..c3d42dc0e 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -377,7 +377,18 @@ passphrase_get ( u32 *keyid, int mode, const char *cacheid,
         *canceled = 1;
     }
   else 
-    log_error (_("problem with the agent: %s\n"), gpg_strerror (rc));
+    {
+      log_error (_("problem with the agent: %s\n"), gpg_strerror (rc));
+      /* Due to limitations in the API of the upper layers they
+         consider an error as no passphrase entered.  This works in
+         most cases but not during key creation where this should
+         definitely not happen and let it continue without requiring a
+         passphrase.  Given that now all the upper layers handle a
+         cancel correctly, we simply set the cancel flag now for all
+         errors from the agent.  */ 
+      if (canceled)
+        *canceled = 1;
+    }
       
 #ifdef ENABLE_NLS
   if (orig_codeset)
@@ -483,7 +494,7 @@ ask_passphrase (const char *description,
 
 /* Return a new DEK object Using the string-to-key sepcifier S2K.  Use
    KEYID and PUBKEY_ALGO to prompt the user.  Returns NULL is the user
-   selected to cancel the passphrase entry and it CANCELED is not
+   selected to cancel the passphrase entry and if CANCELED is not
    NULL, sets it to true.
 
    MODE 0:  Allow cached passphrase
diff --git a/kbx/ChangeLog b/kbx/ChangeLog
index e83c265b3..58505f311 100644
--- a/kbx/ChangeLog
+++ b/kbx/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-31  Werner Koch  <[email protected]>
+
+	* Makefile.am (kbxutil_LDADD): Use GPG_ERROR_LIBS instead of -l.
+	Reordered args.
+
 2007-01-25  Werner Koch  <[email protected]>
 
 	* Makefile.am (kbxutil_LDADD): Added LIBICONV.  Noted by Billy
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 92dd1e439..3b5de70d1 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -46,8 +46,8 @@ libkeybox_a_SOURCES = $(common_sources)
 
 # Note that libcommon is only required to resolve the LIBOBJS.
 kbxutil_SOURCES = kbxutil.c $(common_sources)
-kbxutil_LDADD   = ../jnlib/libjnlib.a ../gl/libgnu.a \
-	          $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
-                  -lgpg-error $(LIBINTL) ../common/libcommon.a $(LIBICONV)
+kbxutil_LDADD   = ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libcommon.a \
+                  $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
+                  $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
 
 $(PROGRAMS) : ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libcommon.a
diff --git a/po/ChangeLog b/po/ChangeLog
index 28bc2410b..cf19d8228 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-31  Werner Koch  <[email protected]>
+
+	* de.po: Fixed a few fuzzy entries.
+
+2007-01-25  Werner Koch  <[email protected]>
+
+	* de.po: Add Plural-Forms.
+
 2006-12-22  Werner Koch  <[email protected]>
 
 	* sv.po: Installed revised and updated translation by Daniel
diff --git a/po/be.po b/po/be.po
index ee1356455..0d08b70ae 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -32,35 +32,40 @@ msgid ""
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "дрэнны MPI"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "дрэнны пароль"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "дрэнны пароль"
@@ -70,21 +75,21 @@ msgstr "дрэнны пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -156,29 +161,49 @@ msgstr ""
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+msgid "Take this one anyway"
+msgstr ""
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Увядзіце пароль\n"
+
+#: agent/genkey.c:146
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "Увядзіце пароль\n"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -189,248 +214,248 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -458,37 +483,37 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "дрэнны пароль"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "скасавана карыстальнікам\n"
@@ -646,12 +671,12 @@ msgstr ""
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -716,76 +741,76 @@ msgstr ""
 msgid "cC"
 msgstr ""
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr ""
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "нечаканыя даньні"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr ""
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr ""
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr ""
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr ""
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "памылка CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr ""
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr ""
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -834,8 +859,8 @@ msgstr "сакрэтны ключ недаступны"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr ""
 
@@ -904,7 +929,7 @@ msgstr ""
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
@@ -1014,7 +1039,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr ""
 
@@ -1037,7 +1062,7 @@ msgstr "сакрэтны ключ недаступны"
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr ""
 
@@ -1046,7 +1071,7 @@ msgstr ""
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
@@ -1102,7 +1127,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Загад> "
 
@@ -1121,27 +1146,27 @@ msgstr "несумяшчальныя загады\n"
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr ""
@@ -1181,88 +1206,88 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr ""
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
@@ -1348,41 +1373,41 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
@@ -1405,7 +1430,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1420,7 +1445,7 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1428,128 +1453,132 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1560,47 +1589,47 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1608,7 +1637,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1628,15 +1657,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1646,7 +1675,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1654,542 +1683,542 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2933
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2939
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2952
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3057
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3020
+#: g10/gpg.c:3059
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3175
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3141
+#: g10/gpg.c:3180
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -2478,415 +2507,415 @@ msgstr ""
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr ""
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr ""
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
@@ -2989,12 +3018,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr ""
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -3167,8 +3196,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -3177,20 +3206,20 @@ msgstr "збой падпісаньня: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
@@ -3207,204 +3236,204 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "дрэнны ключ"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 msgid "toggle between the secret and public key listings"
 msgstr ""
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "падпісаць ключ"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Даступны сакрэтны ключ.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3412,160 +3441,160 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3573,336 +3602,356 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr ""
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3945,12 +3994,12 @@ msgid "writing key binding signature\n"
 msgstr ""
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
@@ -4226,18 +4275,18 @@ msgstr ""
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4245,7 +4294,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4253,91 +4302,91 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4481,7 +4530,7 @@ msgstr ""
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
@@ -4516,311 +4565,311 @@ msgstr "імпартаваць ключы з паслужніка ключоў"
 msgid "searching for names from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 #, fuzzy
 msgid "Key available at: "
 msgstr "Даведка адсутнічае"
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4854,56 +4903,66 @@ msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
@@ -4960,7 +5019,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
@@ -4988,12 +5047,12 @@ msgstr "Увядзіце пароль\n"
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5003,12 +5062,12 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5053,23 +5112,23 @@ msgstr ""
 msgid "unable to display photo ID!\n"
 msgstr ""
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr ""
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -5134,7 +5193,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr ""
 
@@ -5171,146 +5230,146 @@ msgid ""
 "you may answer the next question with yes.\n"
 msgstr ""
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr ""
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr ""
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr ""
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr ""
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr ""
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr ""
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr ""
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr ""
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr ""
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr ""
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
@@ -5319,27 +5378,32 @@ msgstr "паказаць сьпіс ключоў і ID карыстальнік�
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Калі ласка, задайце назву файла даньняў: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "чытаецца stdin ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5373,7 +5437,7 @@ msgid "NOTE: key has been revoked"
 msgstr ""
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -5395,11 +5459,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -5413,35 +5477,35 @@ msgstr ""
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr ""
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5452,34 +5516,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr ""
 
@@ -5637,25 +5701,25 @@ msgstr ""
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -6032,18 +6096,23 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6107,52 +6176,61 @@ msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6160,112 +6238,111 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -6330,7 +6407,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr ""
@@ -6353,137 +6430,137 @@ msgstr ""
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:159
+#: sm/certchain.c:165
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr ""
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "сакрэтны ключ недаступны"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Даведка адсутнічае"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 msgid "no issuer found in certificate"
 msgstr ""
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "праверыць подпіс"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6646,7 +6723,7 @@ msgstr ""
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 msgid "no valid recipients given\n"
 msgstr ""
 
@@ -6699,10 +6776,6 @@ msgstr "дрэнны сэртыфікат"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -6864,29 +6937,38 @@ msgstr "Выкарыстаньне: gpg [выбары] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+msgid "key generation is not available from the commandline\n"
+msgstr ""
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
+
 #: sm/import.c:110
 #, c-format
 msgid "total number processed: %lu\n"
@@ -7472,14 +7554,6 @@ msgstr "непадтрымліваецца"
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "немагчыма адкрыць %s: %s\n"
 
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "паказаць сьпіс ключоў і подпісаў"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "паказаць сьпіс ключоў і подпісаў"
-
 #~ msgid "--nrsign-key user-id"
 #~ msgstr "--nrsign-key user-id"
 
diff --git a/po/ca.po b/po/ca.po
index b13b4df25..92a84c3f7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -53,36 +53,41 @@ msgid ""
 "this session"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "la contrasenya és errònia"
@@ -92,21 +97,21 @@ msgstr "la contrasenya és errònia"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -180,29 +185,50 @@ msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Voleu usar de tota manera aquesta clau?"
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Introduïu la contrasenya\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -213,254 +239,254 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 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:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, 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:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, 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:1373
+#: agent/gpg-agent.c:1379
 #, 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:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, 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:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -488,40 +514,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancel·la"
@@ -681,12 +707,12 @@ msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
 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:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
@@ -755,80 +781,80 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "la capçalera d'armadura és invàlida: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "capçalera d'armadura: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "la capçalera de signatura clara és invàlida\n"
 
 # És un missatge d'error?  ivb
 # «Anidada» és un castellanisme.  Niuades?  Imbricades (SC)??  ivb
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "signatures en text pla imbricades\n"
 
 # FIXME: un-indiar. jm
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "la línia escapada amb guió és invàlida: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "fi de fitxer prematur (no CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "fi de fitxer prematur (en CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "CRC malformat\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "error de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fí de fitxer prematur (al final)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "error en l'última línia\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -884,8 +910,8 @@ msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
@@ -959,7 +985,7 @@ msgstr "no hi ha cap clau pública corresponent: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -1070,7 +1096,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
@@ -1094,7 +1120,7 @@ msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "ix del menú"
 
@@ -1105,7 +1131,7 @@ msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
@@ -1162,7 +1188,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Ordre> "
 
@@ -1179,27 +1205,27 @@ msgstr ""
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@ -1243,55 +1269,55 @@ msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "només podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "s'està llegint des de «%s»\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "no s'ha pogut utilitzar el xifratge IDEA per a totes les claus per a les que "
 "esteu xifrant.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1300,42 +1326,42 @@ msgstr ""
 "forçar l'algoritme de compressió %s (%d) viola les preferències del "
 "destinatari\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
 # És no-wrap?  ivb
 # Com? jm
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCIÓ: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
 "simètric.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "problema en tractar amb un paquet xifrat\n"
 
@@ -1430,43 +1456,43 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clau %08lX: no està protegida - es descarta\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "AVÍS: no s'ha exportat res\n"
 
@@ -1492,7 +1518,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1508,7 +1534,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1516,130 +1542,134 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1650,47 +1680,47 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1701,7 +1731,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:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1721,15 +1751,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1744,7 +1774,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:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1752,562 +1782,562 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, 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:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "la extensió de xifrat «%s» no s'ha carregat per tindre permissos insegurs\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, 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:2472
+#: g10/gpg.c:2511
 #, 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:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, 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:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, 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:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, 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:2759
+#: g10/gpg.c:2798
 #, 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:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 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:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 #, 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:3020
+#: g10/gpg.c:3059
 #, 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:3023
+#: g10/gpg.c:3062
 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:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, 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:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 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:4123
+#: g10/gpg.c:4173
 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:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -2702,282 +2732,282 @@ msgstr "la clau secreta és inusable"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importades: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          no modificades: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subclaus noves: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importades: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no és vàlid\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "açò pot ser causat per l'absència d'autosignatura\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clau %08lX: ja es troba en l'anell privat\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2987,22 +3017,22 @@ msgstr ""
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -3010,126 +3040,126 @@ msgstr ""
 "s»\n"
 "\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocació és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %"
 "08lX\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
@@ -3237,14 +3267,14 @@ msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
@@ -3455,8 +3485,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -3465,20 +3495,20 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
@@ -3495,11 +3525,11 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3508,65 +3538,65 @@ msgstr ""
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Esteu segur de voler fer açò? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "s'està posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -3574,153 +3604,153 @@ msgstr "afegeix un ID d'usuari"
 # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
 # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
 # i no hem unificat en català. Potser li ho diré a Werner. jm.
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "canvia entre el llistat de claus secretes i públiques"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "La clau secreta està disponible.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer açò.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre «toggle» abans.\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3728,246 +3758,246 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "la classe de signatura és desconeguda"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de preferències"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3975,19 +4005,19 @@ msgstr ""
 "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3997,7 +4027,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4006,58 +4036,78 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
 # Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. Sí... (s/N/x) jm
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invàlida"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "L'ID d'usuari «%s» està revocat."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "L'ID d'usuari «%s» està revocat."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "L'ID d'usuari «%s» està revocat."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "l'ID d'usuari «%s» ja està revocat\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4066,205 +4116,205 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVÍS: una signatura d'ID d'usuari està datada %d segons en el futur\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4308,12 +4358,12 @@ msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
@@ -4621,7 +4671,7 @@ msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4629,12 +4679,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4646,7 +4696,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4658,53 +4708,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "s'han creat i signat les claus pública i secreta.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4713,13 +4763,13 @@ msgstr ""
 "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
 "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4728,7 +4778,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4736,26 +4786,26 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4904,7 +4954,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
@@ -4939,320 +4989,320 @@ msgstr "s'està cercant «%s» al servidor HKP %s\n"
 msgid "searching for names from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
 # I no serà «dades xifrades amb %s»?  ivb
 # Sembla que sí, ho marque per a mirar-ho més endavant. jm
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "s'assumeixen dades xifrades amb %s\n"
 
 # L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé!  ivb
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s "
 "en el seu lloc\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
@@ -5286,39 +5336,49 @@ msgstr "signatura %s, algorisme de resum %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el mòdul de xifratge IDEA no està present\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostra més informació\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "AVÍS: %s és una opció desaconsellada.\n"
+
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:796
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "No comprimit"
 
@@ -5326,22 +5386,22 @@ msgstr "No comprimit"
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "aquest missatge pot no ser usable per %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
@@ -5401,7 +5461,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -5440,12 +5500,12 @@ msgstr "Introduïu la contrasenya\n"
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5455,12 +5515,12 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5512,23 +5572,23 @@ msgstr "És aquesta foto correcta (s/N/x)? "
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "No s'ha especificat cap raó"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "La clau ha estat substituïda"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "L'ID d'usuari ja no és vàlid"
 
@@ -5600,7 +5660,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "La vostra decisió? "
 
@@ -5646,112 +5706,112 @@ msgstr ""
 "«sí» a la següent pregunta\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVÍS: S'està usant una clau no fiable!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      Açò podria significar que la signatura és falsificada.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVÍS: Aquesta subclau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Aquesta clau ha estat desactivada.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Nota: La clau ha caducat!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "    No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVÍS: La clau NO és de confiança!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          Probablement la signatura és FALSA.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "No és segur que la signatura pertanya al seu propietari.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: es descarta: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: es descarta: la clau pública ja està present\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5759,42 +5819,42 @@ msgstr ""
 "\n"
 "Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Usuari inexistent.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "La clau pública està desactivada.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "es descarta: la clau pública ja està establida\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: es descarta: la clau pública està desactivada\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces vàlides\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "clau %08lX: sense ID\n"
@@ -5805,27 +5865,32 @@ msgstr "les dades no s'han desat; useu l'opció \"--output\" per desar-les\n"
 
 # Indi? ivb
 # Em pense que no. jm
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Signatura separada.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Introduïu el nom del fitxer de dades: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "s'està llegint d'stdin...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "no s'han pogut obrir les dades signades `%s'\n"
+
 # Indi? ivb
 # Yeh... jm
 #: g10/pubkey-enc.c:107
@@ -5861,7 +5926,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "ha fallat build_packet: %s\n"
@@ -5884,11 +5949,11 @@ msgstr "(Aquesta és una clau de revocació sensible)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "ha fallat make_keysig_packet: %s\n"
@@ -5902,34 +5967,34 @@ msgstr "S'ha creat el certificat de revocació.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Aquesta clau no està protegida!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5948,34 +6013,34 @@ msgstr ""
 "d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
 "disponibles a altres!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Segurament voleu seleccionar %d ací)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raó de la revocació: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "És açò correcte? "
@@ -6164,29 +6229,29 @@ msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu "
 "en mode --pgp2\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
@@ -6586,7 +6651,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6597,11 +6662,16 @@ msgstr ""
 "ha de ser el primer que figure en la línia d'ordres.\n"
 
 # LF -> fi de línia?  ivb
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "la línia d'entrada %u és massa llarga o hi falta un fí de línia\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "no s'ha pogut obrir «%s»: %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6665,52 +6735,61 @@ msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6718,113 +6797,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -6891,7 +6969,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
@@ -6915,148 +6993,148 @@ 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:159
+#: sm/certchain.c:165
 #, 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:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, 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:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "La clau és disponible en: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Empremta digital:"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 #, 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:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, 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:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una signatura"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7230,7 +7308,7 @@ msgstr "certificat duplicat: esborrat"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(No es va donar una descripció)\n"
@@ -7284,10 +7362,6 @@ msgstr "Certificat correcte"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7445,30 +7519,40 @@ msgstr "forma d'ús: gpg [opcions] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent no està disponible en aquesta sessió\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Seleccioneu quin tipus de clau voleu:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8302,18 +8386,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 #~ msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "L'ID d'usuari «%s» està revocat."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "L'ID d'usuari «%s» està revocat."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "L'ID d'usuari «%s» està revocat."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "No hi ha usuari per a la clau\n"
 
diff --git a/po/cs.po b/po/cs.po
index 8d3d76c57..8340d581f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -33,36 +33,41 @@ msgid ""
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "�patn� MPI"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�patn� heslo"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "�patn� heslo"
@@ -72,21 +77,21 @@ msgstr "�patn� heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -157,29 +162,50 @@ msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Pou��t p�esto tento kl��? (a/N) "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Vlo�it heslo\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -190,104 +216,104 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
@@ -296,148 +322,148 @@ msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, 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:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -465,40 +491,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�patn� heslo"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "zru�eno"
@@ -656,12 +682,12 @@ msgstr ""
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
@@ -727,75 +753,75 @@ msgstr "oO"
 msgid "cC"
 msgstr "zZ"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII k�dov�n�: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dov�n�: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �iteln�m form�tu\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "vno�en� podpisy v �iteln�m form�tu\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 msgid "unexpected armor: "
 msgstr "neo�ek�van� ASCII armor: "
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "nespr�vn� ozna�en� ��dku m�nusy: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "�patn� form�t CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr "p�ed�asn� konec souboru (v pati�ce)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "chyba v pati�ce\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dov�n� ASCII: ��dek je del�� ne� %d znak�\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -848,8 +874,8 @@ 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:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
@@ -917,7 +943,7 @@ msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 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:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -1022,7 +1048,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
@@ -1042,7 +1068,7 @@ msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
@@ -1050,7 +1076,7 @@ msgstr "ukon�it toto menu"
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
@@ -1102,7 +1128,7 @@ msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 msgid "verify the PIN and list all data"
 msgstr "ov�� PIN a vypi� v�echna data"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "P��kaz> "
 
@@ -1118,27 +1144,27 @@ msgstr "administr�torsk� p��kazy jsou povoleny\n"
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
@@ -1178,53 +1204,53 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v m�du S2K nelze pou��t symetrick� ESK paket\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "pou�it� �ifry: %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete �ifrovat pouze RSA kl��em o d�lce 2048 bit� a m�n�\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�tu z `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "algoritmus IDEA nelze pou��t pro v�echny kl��e, pro kter� �ifrujete.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1233,37 +1259,37 @@ msgstr ""
 "VAROV�N�: vy��dan� komprima�n� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� data\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "VAROV�N�: zpr�va byla za�ifrov�na slab�m kl��em v symetrick� �if�e.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m se za�ifrovan�m paketem\n"
 
@@ -1354,40 +1380,40 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 msgid "exporting secret keys not allowed\n"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kl�� %s: nen� chr�n�n� - p�esko�eno\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kl�� %s: PGP 2.x kl�� - p�esko�eno\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
@@ -1411,7 +1437,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
@@ -1426,7 +1452,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1434,127 +1460,131 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "zm�nit data na kart�"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "zm�nit PIN karty"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1565,51 +1595,51 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 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:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1617,7 +1647,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1635,17 +1665,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1655,7 +1685,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1663,79 +1693,79 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
 # g10/g10.c:1179#, c-format
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1743,21 +1773,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
 "bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1765,7 +1795,7 @@ msgstr ""
 "VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
 "nastavena bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1773,460 +1803,460 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, 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:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, 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:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra `%s' nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
 "bezpe�n�\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 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:3014
+#: g10/gpg.c:3053
 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:3016
+#: g10/gpg.c:3055
 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 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:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 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:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 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:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -2618,420 +2648,420 @@ msgstr "odstranit nepou�iteln� ��sti z kl��e"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl p�esko�en\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kl��e byly doposud zpracov�ny\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     p�esko�eny nov� kl��e: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez ID u�ivatele: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 importov�no: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                 beze zm�n: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� ID u�ivatel�: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             nov� podkl��e: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nov� podpisy: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       nov� revokace kl���: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      p�e�ten� tajn� kl��e: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "   importovan� tajn� kl��e: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "     tajn� kl��e nezm�n�ny: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             neimportov�no: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         odstran�n� podpisy: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " odstran�n� u�ivatelsk� ID: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "VAROV�N�: kl�� %s obsahuje preference pro algoritmy,\n"
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preference pro �ifrovac� algortimus %s\n"
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preference pro podepisovac� algoritmus %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preference pro komprima�n� algoritmus %s\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "velmi doporu�ujeme aktualiaci nastaven� va�ich preferenc� a\n"
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "distribuci tohoto kl��e aby jste p�ede�el probl�m�m s neshodou algoritm�\n"
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kl�� %s: PKS po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:763
+#: g10/import.c:766
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kl�� %s: p�ijat id u�ivatele \"%s\",kter� nen� podeps�n j�m sam�m\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kl�� %s: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to b�t zp�sobeno chyb�j�c�m podpisem kl��e j�m sam�m\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kl�� %s: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kl�� %s: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kl�� %s: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kl�� %s: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kl�� %s: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kl�� %s: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kl�� %s: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podkl���\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kl�� %s: \"%s\" beze zm�n\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 msgid "importing secret keys not allowed\n"
 msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kl�� %s: tajn� kl�� importov�n\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kl�� %s: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kl�� %s: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "kl�� %s: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kl�� %s: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kl�� %s: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id  \"%s"
 "\"\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kl�� %s neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kl�� %s: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kl�� %s: neplatn� vazba podkl��e\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kl�� %s: neplatn� revoka�n� podkl��\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kl�� %s: p�esko�en identifik�tor u�ivatele \"%s\"\n"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kl�� %s: podkl�� p�esko�en\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kl�� %s: podpis nen� exportovateln� (t��da %02X) - p�esko�eno\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kl�� %s: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "POZN�MKA: S/N kl��e neodpov�d� S/N karty\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "POZN�MKA: prim�rn� kl�� je online a je ulo�en na kart�\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "POZN�MKA: sekund�rn� kl�� je online a je ulo�en na kart�\n"
 
@@ -3143,12 +3173,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
@@ -3336,8 +3366,8 @@ msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
@@ -3348,19 +3378,19 @@ msgstr ""
 "K dispozici je jen kontroln� sou�et kl��e nebo je kl�� na kart� - passphrase "
 "nelze zm�nit.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� ��st prim�rn�ho kl��e jsou ulo�eny na kart�.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
@@ -3377,11 +3407,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3389,186 +3419,186 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr "Opravdu to chcete ud�lat? (a/N) "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "p�esunuji podpis kl��e na spr�vn� m�sto\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 msgid "show key fingerprint"
 msgstr "vypsat fingerprint kl��e"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 msgid "select subkey N"
 msgstr "vyberte podkl�� N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 msgid "check signatures"
 msgstr "kontrolovat podpisy"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "podepsat vybran� ID u�ivatele [* n��e jsou uvedeny relevantn� p��kazy]"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs locally"
 msgstr "podepsat vybran� u�ivatelsk� ID lok�ln�"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr "podepsat vybran� u�ivatelsk� ID d�v�ryhodn�m podpisem"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "podepsat vybran� u�ivatelsk� ID nerevokovateln�m podpisem"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 msgid "delete selected user IDs"
 msgstr "smazat vybran� ID u�ivatele"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 msgid "add a subkey"
 msgstr "p�idat podkl��y"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr "p�esunout z�lo�n� kl�� na kartu"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 msgid "delete selected subkeys"
 msgstr "smazat vybran� podkl��e"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 msgid "delete signatures from the selected user IDs"
 msgstr "smazat podpisy z vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "zm�nit datum expirace pro kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr "ozna�it vybran� u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 msgid "toggle between the secret and public key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 msgid "set preference list for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL preferovan�ho server kl��� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke signatures on the selected user IDs"
 msgstr "revokovat podpisu na vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "revoke selected user IDs"
 msgstr "revokovat vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 msgid "enable key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 msgid "disable key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr "uk�zat vybran� fotografick� ID"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba p�i �ten� bloku tajn�ho kl��e \"%s\": %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3580,156 +3610,156 @@ msgstr ""
 "podpis\n"
 "  (nrsign) nebo libovolnou jejich kombinac�  (ltsign, tnrsign, atd.).\n"
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat v�echny id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Nezn�m� typ podpisu `%s'\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu p�esunout prim�rn� kl��? (a/N) "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybrat pr�v� jeden kl��.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr "P��kaz o�ek�v� jm�no souboru jako argument\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nemohu otev��t `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Chyba p�i �ten� z�lo�n�ho kl��e z `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento kl��? (a/N) "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu revokovat tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Opravdu chcete revokovat cel� kl��? (a/N) "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Opravdu chcete revokovat vybran� podkl��e? (a/N) "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete revokovat tento podkl��? (a/N) "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "D�v�ryhodnost vlastn�ka nelze m�nit je-li pou��v�na datab�ze d�v�ry "
 "poskytnut� u�ivatelem\n"
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam p�edvoleb:\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? (a/N) "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? (a/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "Kl�� nebyl zm�n�n, tak�e nen� pot�eba jej aktualizovat.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3737,71 +3767,71 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U�ivatelsk� ID form�tu PGP 2.x nem� ��dn� p�edvolby\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "V %s tento kl�� revokoval %s kl��em %s\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kl�� m��e b�t revokov�n %s kl��em %s "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3809,17 +3839,17 @@ msgstr ""
 "Pros�m nezapome�te, �e zobrazovan� �daje o platnosti kl��� nemus�\n"
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3827,7 +3857,7 @@ msgstr ""
 "VAROV�N�: ��dn� u�ivatelsk� ID nebylo ozna�eno jako prim�rn�.  Tento p��kaz\n"
 "              m��e zp�sobit, �e za prim�rn� bude pova�ov�no jin� user ID.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3836,54 +3866,74 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� fotografick�ho ID m��e v n�kter�ch\n"
 "         verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le p�idat? (a/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nem�li by jste p�id�vat fotografick� ID k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "neplatn�"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3892,190 +3942,190 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� 'pov��en� revokace' m��e v n�kter�ch\n"
 "          verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nem�li by jste p�id�vat 'pov��en� revokace' k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROV�N�: ustanoven� kl��e 'pov�en�m revok�torem' je nevratn� operace!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jist�, �e tento kl�� chcete pov��it revokac�? (a/N) "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstra�te v�b�r z tajn�ch kl���.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden podkl��.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu expirace podkl��e.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu expirace prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zm�nit dobu platnosti kl��e verze 3\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "p�esko�en v3 podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete p�epsat? (a/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje u�ivatelsk� ID s hashem %s\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podkl�� s indexem %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podeps�no va��m kl��em %s v %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le revokovat? (a/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvo�it pro tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele: %s:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revokov�no va��m kl��em %s v %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROV�N�: podpis ID u�ivatele je datov�n %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Kl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podkl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� %s (uid %d)\n"
@@ -4115,12 +4165,12 @@ msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
@@ -4420,7 +4470,7 @@ msgstr ""
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4428,12 +4478,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4445,7 +4495,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4458,50 +4508,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru ve�ejn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru tajn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "ve�ejn� a tajn� kl�� byly vytvo�eny a podeps�ny.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4509,12 +4559,12 @@ msgstr ""
 "Tento kl�� nem��e b�t pou�it� pro �ifrov�n�. K vytvo�en�\n"
 "sekund�rn�ho kl��e pro tento ��el m��ete pou��t p��kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4522,7 +4572,7 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4530,25 +4580,25 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvo�en� podkl��e pro kl��e v3 nen� v souladu s OpenPGP\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "ulo�en� kl��e na kartu se nezda�ilo: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: z�loha kl��e z karty ulo�ena do `%s'\n"
@@ -4692,7 +4742,7 @@ msgstr "disabled"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
@@ -4726,313 +4776,313 @@ msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 msgid "searching for names from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "pos�l�m kl�� %s na %s server %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "pos�l�m kl�� %s na %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 msgid "no keyserver action!\n"
 msgstr "��dn� operace se serverem kl���!\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 msgid "keyserver timed out\n"
 msgstr "�asov� limit pro server kl��� vypr�el\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 msgid "keyserver internal error\n"
 msgstr "intern� chyba serveru kl���\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem kl���: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 kl�� z %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d kl��� z %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "podivn� velikost �ifrovac�ho kl��e pro sezen� (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s za�ifrovan� kl�� sezen�\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "heslo (passphraze) generov�no s pou�it�m nezn�m�ho algoritmu %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, c-format
 msgid "public key is %s\n"
 msgstr "ve�ejn� kl�� je %s\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "data za�ifrov�na ve�ejn�m kl��em: spr�vn� DEK\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "za�ifrov�na %u-bitov�m %s kl��em, ID %s, vytvo�en�m %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrov�no %s kl��em, ID %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrov�n� ve�ejn�m kl��em selhalo: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrov�no s heslem %lu\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrov�no jedn�m heslem\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "p�edpokl�d�m %s �ifrovan�ch dat\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nen� dostupn�; optimisticky se jej pokus�me nahradit "
 "algoritmem %s\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROV�N�: zpr�va nebyla chr�n�na proti poru�en� jej� integrity\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se za�ifrovanou zpr�vou bylo manipulov�no!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ijte \"gpg --import\", chcete-li jej "
 "u��t\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvo�en %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               pou�it� %s kl��e %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvo�en %s pomoc� kl��e %s s ID u�ivatele %s\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "�PATN� podpis od \"%s\""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROV�N�: detekov�no v�ce podpis�. Kontrolov�n bude pouze prvn�.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
@@ -5066,55 +5116,65 @@ msgstr "VAROV�N�: pou��v�m experiment�ln� hashovac� algoritmus %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VAROV�N�: vy��dan� algoritmus %s nen� doporu�en\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou��v�n� p��kaz \"%s\" se nedoporu�uje - nepou��vejte jej\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
@@ -5170,7 +5230,7 @@ msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavn� ID kl��e %s)"
@@ -5198,12 +5258,12 @@ msgstr "Vlo�it heslo\n"
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5212,12 +5272,12 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %s, vytvo�en� %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
@@ -5267,23 +5327,23 @@ msgstr "Je tato fotografie spr�vn� (a/N/u)? "
 msgid "unable to display photo ID!\n"
 msgstr "nelze zobrazit photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "D�vod nebyl specifikov�n"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "Kl�� je nahrazen"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "Kl�� byl zkompromitov�n"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "Kl�� se ji� nepou��v�"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u�ivatele ji� neplat�"
 
@@ -5349,7 +5409,7 @@ msgstr ""
 "Minim�ln� �rove� d�v�ry tohoto kl��e je: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Va�e rozhodnut�? "
 
@@ -5390,108 +5450,108 @@ msgstr ""
 "n�sleduj�c� ot�zku odpov�d�t ano\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "Pou��t p�esto tento kl��? (a/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROV�N�: Je pou�it ned�v�ryhodn� kl��!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VAROV�N�: tento kl�� m��e b�t revokov�n (revoka�n� kl�� nenalezen)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n kl��em s pov��en�m k revokaci!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamenat, �e podpis je pad�lan�.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento podkl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento kl�� byl ozna�en jako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnost tohoto kl��e!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROV�N�: Tento kl�� nen� certifikov�n d�v�ryhodn�m podpisem!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nic nenazna�uje tomu, �e tento podpis pat�� vlastn�kovi kl��e.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROV�N�: NEd�v��ujeme tomuto kl��i!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravd�podobn� PAD�LAN�.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROV�N�: Tento kl�� nen� certifikov�n dostate�n� d�v�ryhodn�mi podpisy!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nen� jist�, zda tento podpis pat�� vlastn�kovi.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je ji� obsa�en v datab�zi\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nespecifikoval jste identifik�tor u�ivatele (user ID). M��ete pou��t \"-r\"\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr "Aktu�ln� p��jemci:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5499,42 +5559,42 @@ msgstr ""
 "\n"
 "Napi�te identifik�tor u�ivatele (user ID). Ukon�ete pr�zdn�m ��dkem: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Takov� identifik�tor u�ivatele neexistuje.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Ve�ejn� kl�� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je ji� nastaven\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�m� implicitn� adres�t \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "��dn� platn� adresy\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
@@ -5545,27 +5605,32 @@ msgstr ""
 "data nebyla ulo�ena; k jejich ulo�en� pou�ijte parametr p��kazu \"--output"
 "\"\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Podpis odd�len� od dokumentu.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zev datov�ho souboru: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "�tu standardn� vstup ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "chyb� podepsan� data\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "nemohu otev��t podepsan� data '%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5599,7 +5664,7 @@ msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "selhalo vytvo�en� paketu (build_packet): %s\n"
@@ -5621,11 +5686,11 @@ msgstr "(Toto je citliv� revoka�n� kl��)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� pov��en� revoka�n� certifik�t? (a/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "na��zen v�stup do form�tu ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "vytvo�en� podepisovac�ho paketu (make_keysig_packet) selhalo: %s\n"
@@ -5639,33 +5704,33 @@ msgstr "Revoka�n� certifik�t vytvo�en.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "pro \"%s\" nebyl nalezen ��dn� revoka�n� kl��\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "neexistuje odpov�daj�c� ve�ejn� kl��: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? (a/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "nezn�m� kompresn� algoritmus\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento kl�� nen� chr�n�n�!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5684,33 +5749,33 @@ msgstr ""
 "na Va�em po��ta�i m��e ukl�dat data ur�en� k tisku a zp��stupnist je\n"
 "jin�m u�ivatel�m!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m vyberte d�vod revokace:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravd�podobn� zda chcete vybrat %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "M��ete vlo�it dal�� popis. Ukon�ete pr�zdn�m ��dkem:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod revokace: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr "Je d�vod revokace vybr�n spr�vn�? (a/N) "
 
@@ -5885,13 +5950,13 @@ msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
 "form�tu PGP-2.x\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5899,16 +5964,16 @@ msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et jen �iteln� podpisy s kl��i form�tu PGP-2.x\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
@@ -6290,7 +6355,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat z�znam v datab�zi d�v�ry: chyba p�i z�pisu: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6300,11 +6365,16 @@ msgstr ""
 "Pros�m, nezapome�te, �e soubor s podpisem (.sig nebo .asc)\n"
 "by m�l b�t prvn�m souborem zadan�m na p��kazov� ��dce.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "vstupn� ��dek %u je p��li� dlouh� nebo na konci chyb� znak LF\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "nemohu otev��t `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6370,52 +6440,61 @@ msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6424,110 +6503,109 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr "|A|PIN administr�tora"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nov� PIN administr�tora"
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr "|N|Nov� PIN"
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� aplika�n�ch dat\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 msgid "error reading fingerprint DO\n"
 msgstr "chyba p�i �ten� fingerpritnu DO\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 msgid "key already exists\n"
 msgstr "kl�� ji� existuje\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr "existuj�c� kl�� bude p�eps�n\n"
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 msgid "generating new key\n"
 msgstr "generov�n� nov�ho kl��e\n"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr "chyb� �asov� raz�tko vytvo�en�\n"
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "sch�z� RSA modulus nebo nem� velikost %d bit�\n"
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "sch�z� ve�ejn� RSA exponent nebo je del�� ne� %d bit�\n"
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "sch�z� RSA prime %s nebo nem� velikost %d bit�\n"
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 msgid "generating key failed\n"
 msgstr "henerov�n� kl��e se nezda�ilo\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "ov��en� administr�torsk�ho PIN je nyn� prost�ednictv�m tohoto p��kazu "
 "zak�z�no\n"
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
@@ -6591,7 +6669,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
@@ -6615,139 +6693,139 @@ 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:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nemohu otev��t `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "�patn� certifik�t"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kl�� k dispozici na: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA fingerprint: "
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, 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:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikovat podpis"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6910,7 +6988,7 @@ msgstr "duplicita p�edvolby `%s'\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
@@ -6965,10 +7043,6 @@ msgstr "�patn� certifik�t"
 msgid "register a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7133,29 +7207,39 @@ msgstr "u�it�: gpg [mo�nosti]"
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
diff --git a/po/da.po b/po/da.po
index 836dc11ea..541da4ca4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -34,34 +34,39 @@ msgid ""
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "d�rlig mpi"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "d�rlig kodes�tning"
@@ -71,21 +76,21 @@ msgstr "d�rlig kodes�tning"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -158,29 +163,50 @@ msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Brug denne n�gle alligevel? "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Indtast kodes�tning: "
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -191,251 +217,251 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "meddelsom"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: udelod: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -463,37 +489,37 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "d�rlig kodes�tning"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 msgid "cancelled\n"
 msgstr ""
 
@@ -650,11 +676,11 @@ msgstr ""
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -719,77 +745,77 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "ugyldigt panserhoved: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "panserhoved: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "uforventet beskyttelse:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "d�rlig CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
@@ -841,8 +867,8 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr ""
 
@@ -914,7 +940,7 @@ msgstr "skriver offentligt certifikat til '%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -1028,7 +1054,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
@@ -1052,7 +1078,7 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
@@ -1061,7 +1087,7 @@ msgstr "afslut denne menu"
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
@@ -1118,7 +1144,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr ""
 
@@ -1137,27 +1163,27 @@ msgstr "konfliktende kommandoer\n"
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -1197,88 +1223,88 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "l�ser fra '%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
@@ -1363,42 +1389,42 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
@@ -1422,7 +1448,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1437,7 +1463,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1445,132 +1471,136 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1581,53 +1611,53 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1647,16 +1677,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1666,7 +1696,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1674,561 +1704,561 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2933
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2939
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2952
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3057
 #, 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:3020
+#: g10/gpg.c:3059
 #, 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:3023
+#: g10/gpg.c:3062
 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:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3175
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3412
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -2523,416 +2553,416 @@ msgstr "d�rlig hemmelig n�gle"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
@@ -3036,13 +3066,13 @@ msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -3220,8 +3250,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -3230,21 +3260,21 @@ msgstr "signering fejlede: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
@@ -3259,216 +3289,216 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3476,172 +3506,172 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ukendt signaturklasse"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3649,350 +3679,370 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "N�glen er beskyttet.\n"
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4036,12 +4086,12 @@ msgid "writing key binding signature\n"
 msgstr ""
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
@@ -4326,7 +4376,7 @@ msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4334,12 +4384,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4347,7 +4397,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4355,92 +4405,92 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
@@ -4592,7 +4642,7 @@ msgstr "sl�fra"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig n�glering"
@@ -4627,314 +4677,314 @@ msgstr "eksport�r n�gler til en n�gletjener"
 msgid "searching for names from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ukendt cifferalgoritme "
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "krypt�r data"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 #, fuzzy
 msgid "Key available at: "
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4968,57 +5018,67 @@ msgstr "%s signatur fra: %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/misc.c:813
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ikke bearbejdet"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
@@ -5075,7 +5135,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
@@ -5102,12 +5162,12 @@ msgstr "Indtast kodes�tning: "
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5116,12 +5176,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5170,24 +5230,24 @@ msgstr "Er dette korrekt (j/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 #, fuzzy
 msgid "Key is superseded"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -5259,7 +5319,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Dit valg? "
 
@@ -5298,155 +5358,155 @@ msgid ""
 "you may answer the next question with yes.\n"
 msgstr ""
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruger n�gle uden tillid!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dette kan betyde at signaturen er forfalsket.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undern�gle er blevet tilbagekaldt af dens ejer!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi tror IKKE p� denne n�gle!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er formentlig FORFALSKET.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Ingen s�dan bruger-id.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig n�gle er allerede valgt som standard modtager\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
@@ -5455,27 +5515,32 @@ msgstr "n�gle %08lX: ingen bruger-id\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "kan ikke �bne %s: %s\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5510,7 +5575,7 @@ msgid "NOTE: key has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
@@ -5533,11 +5598,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -5552,36 +5617,36 @@ msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5592,34 +5657,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
@@ -5780,25 +5845,25 @@ msgstr "Kan ikke tjekke signatur: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -6177,18 +6242,23 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "kan ikke �bne '%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6253,52 +6323,61 @@ msgstr "ingen standard offentlig n�glering\n"
 msgid "reading public key failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6306,114 +6385,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
@@ -6480,7 +6558,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
@@ -6503,141 +6581,141 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Godt certifikat"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Godt certifikat"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingeraftryk:"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "godkend en signatur"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6799,7 +6877,7 @@ msgstr "vis pr�ferencer"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adresser\n"
@@ -6853,10 +6931,6 @@ msgstr "Godt certifikat"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7014,29 +7088,38 @@ msgstr "brug: gpg [flag] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+msgid "key generation is not available from the commandline\n"
+msgstr ""
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -7803,18 +7886,6 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 #~ msgstr "kan ikke �bne %s: %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "N�glen er beskyttet.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "N�glen er beskyttet.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "N�glen er beskyttet.\n"
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "Ingen bruger-ID for n�gle\n"
 
@@ -8010,10 +8081,6 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 #~ msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
 #, fuzzy
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "kan ikke �bne %s: %s\n"
-
-#, fuzzy
 #~ msgid "          \""
 #~ msgstr "              alias \""
 
diff --git a/po/de.po b/po/de.po
index 415d23c56..61ba66f3d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.9.90\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-01-25 09:30+0100\n"
-"PO-Revision-Date: 2007-01-25 09:33+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
+"PO-Revision-Date: 2007-01-31 14:37+0100\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
 #: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
 #: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:831 g10/sign.c:1140 g10/tdbio.c:538
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
@@ -88,10 +88,10 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:493 g10/sign.c:813 g10/sign.c:1008 g10/sign.c:1124
-#: g10/sign.c:1280 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1772
-#: sm/gpgsm.c:1809 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -170,8 +170,12 @@ msgid ""
 msgid_plural ""
 "Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
 "passphrase should%%0Abe at least %u characters long."
-msgstr[0] "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  Eine Passphrase sollte%%0A mindestens %u Zeichen lang sein."
-msgstr[1] "WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  Eine Passphrase sollte%%0A mindestens %u Zeichen lang sein."
+msgstr[0] ""
+"WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  "
+"Eine Passphrase sollte%%0A mindestens %u Zeichen lang sein."
+msgstr[1] ""
+"WARNUNG:  Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben.  "
+"Eine Passphrase sollte%%0A mindestens %u Zeichen lang sein."
 
 #: agent/genkey.c:100
 msgid "Take this one anyway"
@@ -1144,7 +1148,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:168 g10/gpg.c:3859 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
@@ -1198,7 +1202,7 @@ msgstr ""
 "Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:228 g10/sign.c:1299
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@ -1219,7 +1223,7 @@ msgstr "benutze Cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@ -1250,7 +1254,7 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %"
 "s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encode.c:671 g10/sign.c:969
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1266,7 +1270,7 @@ msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) "
 "verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encode.c:837 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
@@ -1511,7 +1515,7 @@ msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/gpg.c:386 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
@@ -1851,411 +1855,411 @@ msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:2239 g10/gpg.c:2883 g10/gpg.c:2895
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, 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:2252
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschlüsselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte nicht "
 "geladen\n"
 
-#: g10/gpg.c:2407 g10/gpg.c:2419
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 
-#: g10/gpg.c:2501
+#: g10/gpg.c:2511
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2524 g10/gpg.c:2717 g10/keyedit.c:4078
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2536
+#: g10/gpg.c:2546
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2539
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2546
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2549
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2556
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2559
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2577
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr "Zeige die Foto-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2579
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2581
+#: g10/gpg.c:2591
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2583
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2587
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr "Zeie anwenderseitige Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2589
+#: g10/gpg.c:2599
 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:2591
+#: g10/gpg.c:2601
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2593
+#: g10/gpg.c:2603
 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:2595
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2607
 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:2604
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2614
+#: g10/gpg.c:2624
 #, 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:2788
+#: g10/gpg.c:2798
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2791
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2872 sm/gpgsm.c:1232
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2876
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2885
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2913
 #, 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:2917
+#: g10/gpg.c:2927
 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:2923
+#: g10/gpg.c:2933
 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:2929
+#: g10/gpg.c:2939
 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:2942
+#: g10/gpg.c:2952
 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:3008 g10/gpg.c:3032 sm/gpgsm.c:1288
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3014 g10/gpg.c:3038 sm/gpgsm.c:1296
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3020
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3026
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3045
+#: g10/gpg.c:3055
 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:3047
+#: g10/gpg.c:3057
 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:3049
+#: g10/gpg.c:3059
 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:3052
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3066
 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:3063
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3072
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3076
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3080
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3113
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3160
+#: g10/gpg.c:3170
 #, 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:3165
+#: g10/gpg.c:3175
 #, 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:3170
+#: g10/gpg.c:3180
 #, 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:3262
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3283
 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:3294
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3313
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3313
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3326
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3328
+#: g10/gpg.c:3338
 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:3331
+#: g10/gpg.c:3341
 #, 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:3349
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3362
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3389
 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:3382
+#: g10/gpg.c:3392
 #, 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:3402
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3436
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3448
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3469
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3556
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3558
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3569
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3579
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3630
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3638
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3728
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3845
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4161
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4163
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4196
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
@@ -2827,7 +2831,7 @@ msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
 
-#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:835 g10/sign.c:1144
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -3947,29 +3951,29 @@ msgid "invalid"
 msgstr "ungültig"
 
 #: g10/keyedit.c:3244
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\" compacted: %s\n"
-msgstr "User-ID \"%s\": bereits bereinigt\n"
+msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
 
 #: g10/keyedit.c:3251
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\": %d signature removed\n"
-msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
+msgstr "User-ID \"%s\": %d Signatur entfernt\n"
 
 #: g10/keyedit.c:3252
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
-msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
+msgstr "User-ID \"%s\": %d Signaturen entfernt\n"
 
 #: g10/keyedit.c:3260
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\": already minimized\n"
-msgstr "User-ID \"%s\": bereits bereinigt\n"
+msgstr "User-ID \"%s\": bereits minimiert\n"
 
 #: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
-msgstr "User-ID \"%s\": bereits bereinigt\n"
+msgstr "User-ID \"%s\": bereits sauber\n"
 
 #: g10/keyedit.c:3355
 msgid ""
@@ -5168,56 +5172,66 @@ msgstr "WARNUNG: Verwendung des experimentellen Hashverfahrens %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "Siehe %s für weitere Infos\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "WARNUNG: \"%s\" ist ein nicht ratsamer Befehl - verwenden Sie ihn nicht.\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: Die Option \"%s\" is veraltet - sie hat keine Wirkung\n"
+
+#: g10/misc.c:752
+#, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "WARNUNG: \"%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannte Option '%s'\n"
@@ -5276,7 +5290,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:589
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschlüssel-ID %s)"
@@ -5304,12 +5318,12 @@ msgstr "Geben Sie die Passphrase ein\n"
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Problem mit dem Agenten: %s\n"
 
-#: g10/passphrase.c:568
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5318,12 +5332,12 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
 "Benutzer: \"%s\"\n"
 
-#: g10/passphrase.c:576
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schlüssel, ID %s, erzeugt %s"
 
-#: g10/passphrase.c:585
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (Unterschlüssel aus Hauptschlüssel-ID %s)"
@@ -5503,116 +5517,116 @@ msgstr ""
 "Genannten gehört. Wenn Sie *wirklich* wissen, was Sie tun,\n"
 "können Sie die nächste Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "Diesen Schlüssel trotzdem benutzen? (j/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "WARNUNG: Dieser schlüssel ist u.U. widerrufen: Widerrufschlüssel ist nicht "
 "vorhanden\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "WARNUNG: Dieser Schlüssel wurde vom vorgesehen Widerrufer widerrufen!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schlüssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Das könnte bedeuten, daß die Signatur gefälscht ist.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Unterschlüssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Hinweis: Dieser Schlüssel wurde abgeschaltet.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "Hinweis: Überprüfte Adresse des Unterzeichners ist `%s'\n"
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 "Hinweise: Adresse des Unterzeichners `%s' passt nicht zum DNS-Eintrag\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "\"Trust\"-Ebene auf VOLLSTÄNDIG geändert (wg. gültiger PKA-Info)\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "\"Trust\"-Ebene auf NIEMALS geändert (wg. falscher PKA-Info)\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine FÄLSCHUNG.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schlüssel ist nicht durch hinreichend vertrauenswürdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: übersprungen: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Sie haben keine User-ID angegeben (Sie können die Option \"-r\" verwenden).\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr "Derzeitige Empfänger:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5620,43 +5634,43 @@ msgstr ""
 "\n"
 "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Hinweis: Schlüssel %s besitzt nicht die %s Eigenschaft\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
@@ -5688,9 +5702,9 @@ msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht öffnen.\n"
 
 #: g10/plaintext.c:589
-#, fuzzy, c-format
+#, c-format
 msgid "can't open signed data fd=%d: %s\n"
-msgstr "kann signierte Datei '%s' nicht öffnen.\n"
+msgstr "kann signierte Daten auf fd=%d nicht öffnen: %s\n"
 
 #: g10/pubkey-enc.c:107
 #, c-format
@@ -6033,13 +6047,13 @@ msgstr "Prüfung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:791
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln eine abgetrennte "
 "Unterschrift erzeugt werden\n"
 
-#: g10/sign.c:867
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6047,17 +6061,17 @@ msgstr ""
 "WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
 "Empfängervoreinstellungen\n"
 
-#: g10/sign.c:994
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:1109
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie Klartextunterschriften nur mit PGP-2.x-artigen "
 "Schlüssel machen\n"
 
-#: g10/sign.c:1293
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschlüsselung wird verwendet\n"
@@ -6463,9 +6477,9 @@ msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 
 #: g10/verify.c:249
-#, fuzzy, c-format
+#, c-format
 msgid "can't open fd %d: %s\n"
-msgstr "'%s' kann nicht geöffnet werden: %s\n"
+msgstr "fd=%d kann nicht geöffnet werden: %s\n"
 
 #: jnlib/logging.c:626
 #, c-format
@@ -6543,9 +6557,11 @@ msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
 #: scd/app-openpgp.c:1316
-#, fuzzy, c-format
+#, c-format
 msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-msgstr "||Bitte die PIN auf der Tastatur des Kartenleser eingeben"
+msgstr ""
+"||Bitte die PIN auf der Tastatur des Kartenleser eingeben%%0A[Sigs erzeugt: %"
+"lu]"
 
 #: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
@@ -7298,6 +7314,15 @@ msgstr "Signieren mit `%s' nicht möglich: %s\n"
 msgid "this command has not yet been implemented\n"
 msgstr "Dieser Befehl wurde noch nicht implementiert\n"
 
+#: sm/gpgsm.c:1601
+msgid "key generation is not available from the commandline\n"
+msgstr "Die Schlüsselerzeugung ist über die Kommandozeile nicht möglich\n"
+
+#: sm/gpgsm.c:1602
+#, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Bitte verwenden Sie das Skript \"%s\" zur Erzeugung eines neuen Schlüssels.\n"
+
 #: sm/import.c:110
 #, c-format
 msgid "total number processed: %lu\n"
diff --git a/po/el.po b/po/el.po
index 17f94132a..126e463c5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -32,36 +32,41 @@ msgid ""
 "this session"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "���� MPI"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "���� ����� ������"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "���� ����� ������"
@@ -71,21 +76,21 @@ msgstr "���� ����� ������"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -156,29 +161,50 @@ msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "����� ���������� ����� ��� ��������; "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "�������������� �� ����� ������\n"
+
+#: agent/genkey.c:146
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -189,253 +215,253 @@ msgstr ""
 "��������:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "���������"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ������������: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -463,40 +489,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "���� ����� ������"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "�������"
@@ -655,12 +681,12 @@ msgstr "�������� ������������ �� �� gpg-agent\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
@@ -726,77 +752,77 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "��������: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "�� ������ ����������� ���������: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "����������� ���������: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "�� ������ ����������� clearsig\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "����������� �� ���������������� ���������\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "�� ����������� ��������:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "�� ������ dash escaped ������: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "������ ����� ������� (������� CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "������ ����� ������� (����� CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "����� ����� CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "������ CRC: %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "������ ����� ������� (��� �railer)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "������ ��� ������ trailer\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -850,8 +876,8 @@ msgstr "�� ������� ������ ��� ����� ���������"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
@@ -925,7 +951,7 @@ msgstr "������ ��������� ������� ������: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -1037,7 +1063,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
@@ -1061,7 +1087,7 @@ msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
@@ -1070,7 +1096,7 @@ msgstr "����������� ����� ��� �����"
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
@@ -1127,7 +1153,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "������> "
 
@@ -1146,27 +1172,27 @@ msgstr "������������� �������\n"
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
@@ -1209,49 +1235,49 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "�������� ������ ���� ����������� ������� ESK ���� ��� ���������� S2K\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "����� ��� ���������������: %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "������������� �� ������� RSA ��� 2048 bit � ��� ���� ���� �� ��������� --"
 "pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�������� ��� `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "�������� ������ ��� ��������������� IDEA ��� ��� �� ������� �� �� "
 "�������������������.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1259,7 +1285,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1268,41 +1294,41 @@ msgstr ""
 "� ������������ ������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "�������������: �� ������ ��������������� �� ������� ������ ���\n"
 "���������� ��������������.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "�������� ��� �������� ���������������� �������\n"
 
@@ -1396,42 +1422,42 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
@@ -1456,7 +1482,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
@@ -1471,7 +1497,7 @@ msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1479,128 +1505,132 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1611,47 +1641,47 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1659,7 +1689,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1679,15 +1709,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1697,7 +1727,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1705,565 +1735,565 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2933
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2939
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2952
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3175
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3141
+#: g10/gpg.c:3180
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -2653,427 +2683,427 @@ msgstr "�� ��������������� ������� ������"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��������� �������� ��� ����� %d\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ������� ����� ����� ���� ������������\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ��� ������� ��� �������������: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ����� user ID: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              ����������: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             ����������: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          ��� user ID: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ��� ����������: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   ���� ���������� ��������: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ���������� ������� �������: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " ���������� ������� �������: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ��  ����������: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
@@ -3182,12 +3212,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
@@ -3402,8 +3432,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
@@ -3412,20 +3442,20 @@ msgstr "� �������� �������: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
@@ -3442,219 +3472,219 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3662,242 +3692,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "������� ����� ���������"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3905,19 +3935,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3925,7 +3955,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3934,55 +3964,75 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "�� user ID \"%s\" ����������."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "�� user ID \"%s\" ����������."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "�� user ID \"%s\" ����������."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3992,38 +4042,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -4031,168 +4081,168 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "�������� ���������: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
@@ -4235,12 +4285,12 @@ msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
@@ -4544,7 +4594,7 @@ msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4552,12 +4602,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4569,7 +4619,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4581,50 +4631,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4635,12 +4685,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4648,7 +4698,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4656,28 +4706,28 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
@@ -4824,7 +4874,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�� ������� �������� ��������\n"
@@ -4859,314 +4909,314 @@ msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 msgid "searching for names from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s ������ ���������������� ��������\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "������� ������ ����� %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "��������������� �� %u-bit %s ������, ID %08lX, ������������� %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "��������������� �� %s key, ID %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������� �� ������� ������ �������: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "��������������� �� %lu ������� �������\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "��������������� �� 1 ����� ������\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "������� %s ���������������� ���������\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
 "%s ��������\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "���������������� OK\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
@@ -5202,56 +5252,66 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = ���������� ������������ �����������\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "����������"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
@@ -5309,7 +5369,7 @@ msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
@@ -5338,12 +5398,12 @@ msgstr "�������������� �� ����� ������\n"
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5353,12 +5413,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5409,23 +5469,23 @@ msgstr "����� ���� � ���������� ����� (y/N/q); "
 msgid "unable to display photo ID!\n"
 msgstr "�������� ����������� ��� photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "��� ���� ������� �����"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "�� ������ ���� ����������"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "�� ������ ���� �������"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "�� ������ �� ��������������� �����"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "�� User ID ��� ����� ����� ������"
 
@@ -5496,7 +5556,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "� ������� ���; "
 
@@ -5542,115 +5602,115 @@ msgstr ""
 "�� ���������� ���� ������� ������� ����������\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "����� ���������� ����� ��� ��������; "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�������������: ����� �������� ����� �����������!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "�������������: ���� �� ������ ������ �� ��������� (������ �� ������ "
 "���������)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         ���� ������ �� �������� ��� � �������� ����� ������������.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "�������������: ���� �� ��������� ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "��������: ���� �� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "��������: ���� �� ������ ���� �����!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ������������ "
 "��������!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         ��� ������� ������� ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�������������: ��� �������������� ���� �� ������!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         � �������� ������ ����� ������������.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ���������\n"
 "������� ������������!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ������������: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5658,43 +5718,43 @@ msgstr ""
 "\n"
 "�������������� �� user ID. ����� �� ��� ����� ������: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "��� ������� ���� �� user ID.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "�� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "������������: ������� ������ ���� ��� �������\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "������ ������ ���������\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
@@ -5703,27 +5763,32 @@ msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "���������� ��������.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "�������� �� ����� ������� ���������: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "�������� ��� stdin ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "��� �������� ������������� ��������\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "�������� ��������� �������������� ��������� `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5757,7 +5822,7 @@ msgid "NOTE: key has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �������: %s\n"
@@ -5780,11 +5845,11 @@ msgstr "(���� ����� ��� ��������� ������ ���������)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "������������ ������ �� ����������� ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �������: %s\n"
@@ -5798,34 +5863,34 @@ msgstr "������������� ��������� �������������.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�� ������� ������ `%s' �� �������: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "��������: ���� �� ������ ��� �������������!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5844,33 +5909,33 @@ msgstr ""
 "������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
 "�������� ��� �� ��� ����� ��������� �� ������!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "�������"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "����� ��� ��������: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(��� ������ ���������)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "����� ���� �������; "
@@ -6053,13 +6118,13 @@ msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
 "--pgp2 ���������\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6067,16 +6132,16 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ���������� ������ �� ������� ����� PGP 2.x �� ��������� --pgp2\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
@@ -6465,7 +6530,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6475,11 +6540,16 @@ msgstr ""
 "�������� ��� ������� ��� �� ������ ��������� (.sig or .asc)\n"
 "������ �� ����� �� ����� ������ ��� ������ �������.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "������ ������� %u ����� ���� ������ � ��� ������ �� LF\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "�������� ��������� ��� `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6543,52 +6613,61 @@ msgstr "�������� ������������ ��� cache �����������: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6596,113 +6675,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ��� �����������\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
@@ -6769,7 +6847,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
@@ -6793,139 +6871,139 @@ msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "���� �������������"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "������ ��������� ���: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "���� �� ������ ���� �����!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "���������� ��� fingerprint"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "���������� ���� ���������"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7089,7 +7167,7 @@ msgstr "� ���������� %c%lu ������������\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(��� ������ ���������)\n"
@@ -7143,10 +7221,6 @@ msgstr "���� �������������"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7303,29 +7377,39 @@ msgstr "�����: gpg [��������] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8129,18 +8213,6 @@ msgstr "��� ������������� � ���������� ���������� %d%s\n"
 #~ msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "�� user ID \"%s\" ����������."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "�� user ID \"%s\" ����������."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "�� user ID \"%s\" ����������."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
diff --git a/po/eo.po b/po/eo.po
index 701dd3e53..87cfbfd7d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -32,36 +32,41 @@ msgid ""
 "this session"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "malbona pasfrazo"
@@ -71,21 +76,21 @@ msgstr "malbona pasfrazo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -157,29 +162,50 @@ msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "�u tamen uzi �i tiun �losilon? "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Donu pasfrazon\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -190,252 +216,252 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, 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:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -463,40 +489,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
@@ -655,12 +681,12 @@ msgstr "komunikproblemo kun gpg-agent\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
@@ -727,77 +753,77 @@ msgstr ""
 msgid "cC"
 msgstr "k"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "nevalida kiraso�apo: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "kiraso�apo: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "nevalida �apo de klarteksta subskribo\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -853,8 +879,8 @@ msgstr "sekreta �losilo ne havebla"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
@@ -928,7 +954,7 @@ msgstr "skribas publikan �losilon al '%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -1040,7 +1066,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
@@ -1064,7 +1090,7 @@ msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
@@ -1073,7 +1099,7 @@ msgstr "forlasi �i tiun menuon"
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
@@ -1130,7 +1156,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Komando> "
 
@@ -1149,27 +1175,27 @@ msgstr "malkongruaj komandoj\n"
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
@@ -1211,89 +1237,89 @@ msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "eblas �ifri nur per RSA-�losiloj de maksimume 2048 bitoj kun --pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "ne povas uzi la �ifron IDEA por �iuj �losiloj, al kiuj vi �ifras.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, fuzzy, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTO: mesa�o estis �ifrita per malforta �losilo en la simetria �ifro.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "problemo �e traktado de �ifrita paketo\n"
 
@@ -1382,41 +1408,41 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
@@ -1440,7 +1466,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
@@ -1455,7 +1481,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1463,128 +1489,132 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1595,47 +1625,47 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1643,7 +1673,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1663,15 +1693,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1681,7 +1711,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1689,560 +1719,560 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 #, 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:3020
+#: g10/gpg.c:3059
 #, 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:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -2621,417 +2651,417 @@ msgstr "neuzebla sekreta �losilo"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
@@ -3140,13 +3170,13 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -3373,8 +3403,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -3383,20 +3413,20 @@ msgstr "subskribado malsukcesis: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
@@ -3413,11 +3443,11 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3425,207 +3455,207 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3633,266 +3663,266 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nekonata klaso de subskribo"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3901,55 +3931,75 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "nevalida"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3959,201 +4009,201 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 #, fuzzy
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4197,12 +4247,12 @@ msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
@@ -4505,7 +4555,7 @@ msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4513,12 +4563,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4530,7 +4580,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4542,50 +4592,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4594,12 +4644,12 @@ msgstr ""
 "Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4607,7 +4657,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4615,26 +4665,26 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
@@ -4786,7 +4836,7 @@ msgstr "el"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
@@ -4821,316 +4871,316 @@ msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 msgid "searching for names from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "�ifro IDEA ne disponata, optimisme provas uzi %s anstata�e\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -5164,57 +5214,67 @@ msgstr "%s-subskribo de: %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/misc.c:813
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, fuzzy, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
@@ -5271,7 +5331,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
@@ -5299,12 +5359,12 @@ msgstr "Donu pasfrazon\n"
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5314,12 +5374,12 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5367,23 +5427,23 @@ msgstr "�u tio estas �usta (j/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "�losilo estas anstata�igita."
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "�losilo estas kompromitita"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "�losilo estas ne plu uzata"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
@@ -5456,7 +5516,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Via decido? "
 
@@ -5502,111 +5562,111 @@ msgstr ""
 "la sekva demando per \"jes\"\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTO: Uzas nefidatan �losilon!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tio povas signifi, ke la subskribo estas falsa.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu sub�losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVERTO: �i tiu �losilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La subskribo ver�ajne estas FALSA.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTO: �i tiu �losilo ne estas atestita kun sufi�e fidataj subskriboj!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika �losilo jam �eestas\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5614,42 +5674,42 @@ msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Publika �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "ignorita: publika �losilo jam agordita\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
@@ -5658,27 +5718,32 @@ msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5713,7 +5778,7 @@ msgid "NOTE: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
@@ -5736,11 +5801,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "listigo de �losilblokoj malsukcesis: %s\n"
@@ -5755,36 +5820,36 @@ msgstr "�losilo %08lX: revokatestilo aldonita\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5795,37 +5860,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
@@ -5996,27 +6061,27 @@ msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 #, fuzzy
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "eblas klartekste subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
@@ -6400,7 +6465,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6410,11 +6475,16 @@ msgstr ""
 "Bonvolu memori, ke la subskribodosiero (.sig a� .asc)\n"
 "devas esti la unua dosiero donita en la komandlinio.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, a� mankas linifino\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "ne povas malfermi '%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6478,52 +6548,61 @@ msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6531,113 +6610,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -6704,7 +6782,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
@@ -6728,148 +6806,148 @@ 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:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenia helpo disponata"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problemo �e legado de atestilo: %s\n"
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problemo �e legado de atestilo: %s\n"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingrospuro:"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "kontroli subskribon"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7032,7 +7110,7 @@ msgstr "ripetita atestilo - forvi�ita"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "nevalida respondo de agento\n"
@@ -7086,10 +7164,6 @@ msgstr "Bona atestilo"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7246,29 +7320,39 @@ msgstr "uzado: gpg [opcioj] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8061,18 +8145,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 #~ msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "Mankas uzantidentigilo por �losilo\n"
 
diff --git a/po/es.po b/po/es.po
index 947ef47ba..99f934591 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -36,26 +36,31 @@ msgid ""
 "this session"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "l�nea demasiado larga"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase contrase�a demasiado larga\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorrecto"
@@ -69,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:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -83,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:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -93,21 +98,21 @@ msgstr "Frase contrase�a incorrecta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -178,29 +183,50 @@ msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "PIN [firmas hechas: %lu]"
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "�Usar esta clave de todas formas? (s/N) "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Introduzca frase contrase�a\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -211,253 +237,253 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error enviando a `%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) fall� en %s: %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, 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:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, 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:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claves omitidas\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, 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:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -485,23 +511,23 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -517,17 +543,17 @@ msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "Frase contrase�a incorrecta"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado"
@@ -686,12 +712,12 @@ msgstr "problema de comunicaci�n con el agente gpg\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
@@ -756,75 +782,75 @@ msgstr "vV"
 msgid "cC"
 msgstr "cC"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "cabecera de armadura inv�lida: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara inv�lida\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 msgid "unexpected armor: "
 msgstr "armadura inesperada: "
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones inv�lida: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter inv�lido radix64 %02X omitido\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobaci�n prematuro\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Error en suma de comprobaci�n: %06lX - %06lX\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -878,8 +904,8 @@ 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:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
@@ -947,7 +973,7 @@ msgstr "URL de donde recuperar la clave p�blica: "
 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:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
@@ -1054,7 +1080,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
@@ -1074,7 +1100,7 @@ msgstr "las partes secretas de la clave no est�n disponibles\n"
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "sale de este men�"
 
@@ -1082,7 +1108,7 @@ msgstr "sale de este men�"
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
@@ -1134,7 +1160,7 @@ msgstr "men� para cambiar o desbloquear el PIN"
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Orden> "
 
@@ -1150,27 +1176,27 @@ msgstr "Se permiten �rdenes de administrador\n"
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
@@ -1209,46 +1235,46 @@ msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no puede usar un paquete sim�trico ESK debido al modo S2K\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "usando cifrado %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "solo puede cifrar a claves RSA de 2048 bits o menos en modo --pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "no se puede usar el algoritmo IDEA para todas las claves a las que cifra.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1256,7 +1282,7 @@ msgstr ""
 "AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1265,40 +1291,40 @@ msgstr ""
 "AVISO: forzar el algoritmo de compresi�n %s (%d) va en contra\n"
 "de las preferencias del receptor\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "problema trabajando con un paquete cifrado\n"
 
@@ -1389,40 +1415,40 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 msgid "exporting secret keys not allowed\n"
 msgstr "no se permite exportar claves secretas\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clave %s: no protegida - omitida\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVISO: la clave secreta %s no tiene suma de comprobaci�n simple SK\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
@@ -1445,7 +1471,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
@@ -1464,7 +1490,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1472,127 +1498,131 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1603,43 +1633,43 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr "generar mensajes compatibles con PGP 2.x"
 
@@ -1647,7 +1677,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:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1655,7 +1685,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1675,15 +1705,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1693,7 +1723,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1701,71 +1731,71 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1773,18 +1803,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1792,441 +1822,441 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, 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:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "no se carga el cifrado de ampliaci�n `%s' por permisos inseguros\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, 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:2472
+#: g10/gpg.c:2511
 #, 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:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, 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:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, 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:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 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:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, 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:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 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:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 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:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2234,19 +2264,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:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -2642,421 +2672,421 @@ msgstr "clave secreta inutilizable"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu claves procesadas hasta ahora\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          no importadas: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "AVISO: la clave %s contiene preferencias para no disponible\n"
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": algoritmo de resumen preferido %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": algoritmo de compresi�n preferido %s\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-dustribuya esta clave para evitar potenciales problemas de\n"
 "diferencias en los algoritmos.\n"
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %s: reparada la subclave PKS corrompida\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %s: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %s: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %s: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %s: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %s: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clave %s: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clave %s: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %s: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clave %s: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clave %s: no hay subclave que unir a la clave\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %s: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %s: revocaci�n de subclave inv�lida\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave a�adida\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTA: clave primaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTA: clave secundaria en l�nea y almacenada en la tarjeta\n"
 
@@ -3166,12 +3196,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
@@ -3357,8 +3387,8 @@ msgstr "He comprobado esta clave meticulosamente.\n"
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -3369,19 +3399,19 @@ msgstr ""
 "La clave tiene s�lo un apuntador u objetos de clave en la propia tarjeta\n"
 "- no hay frase contrase�a que cambiar.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
@@ -3398,11 +3428,11 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3410,187 +3440,187 @@ msgstr ""
 "No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Realmente quiere hacer esto? (s/N) "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 msgid "show key fingerprint"
 msgstr "muestra huella dactilar de la clave"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 msgid "select subkey N"
 msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 msgid "check signatures"
 msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs locally"
 msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "firmar IDs seleccionados con firma no revocable"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "a�adir un identificador de usuario"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "a�adir un ID fotogr�fico"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 msgid "delete selected user IDs"
 msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 msgid "add a subkey"
 msgstr "a�adir una subclave"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 msgid "delete selected subkeys"
 msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "a�adir una clave de revocaci�n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 msgid "delete signatures from the selected user IDs"
 msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 msgid "set preference list for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "establecer URL del servidor de claves preferido por los IDs seleccionados"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "revoke selected user IDs"
 msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 msgid "enable key"
 msgstr "habilita clave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 msgid "disable key"
 msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr "mostrar fotos de los ID seleccionados"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3601,226 +3631,226 @@ msgstr ""
 "locales (lsign), una 't' para firmas fiables (tsign), `nr' para firmas no\n"
 "revocables (nrsign) o cualquier combinaci�n de ellas (ltsign, tnrsign, etc)\n"
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Clase de firma desconocida `%s'\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr "�Borrar realmente la clave primaria? (s/N)"
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr "La orden espera un nombre de fichero como argumento\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�De verdad quiere borrar esta clave? (s/N) "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Revocar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�De verdad quiere revocar la clave completa? (s/N) "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�De verdad quiere revocar las subclaves seleccionadas? (s/N)"
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�De verdad quiere revocar esta subclave? (s/N) "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confianza del propietario no puede establecerse si se est� usando\n"
 "una base de datos de confianza propocionada por el usuario\n"
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr "Establecer lista de preferencias a:\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3828,17 +3858,17 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3846,7 +3876,7 @@ msgstr ""
 "AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3855,55 +3885,75 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "Armadura no v�lida"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "ID de usuario \"%s\" revocado."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "ID de usuario \"%s\" revocado."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "ID de usuario \"%s\" revocado."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3912,191 +3962,191 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobreescribir? (s/N) "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
@@ -4136,12 +4186,12 @@ msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
@@ -4441,7 +4491,7 @@ msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4449,12 +4499,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4466,7 +4516,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4479,50 +4529,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4530,12 +4580,12 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
 "la orden \"--edit-key\" para crear una subclave con este prop�sito.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4543,7 +4593,7 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4551,25 +4601,25 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no se puede crear fichero de respaldo `%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -4715,7 +4765,7 @@ msgstr "deshabilitado"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduzca n�mero(s), O)tro, o F)in >"
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
@@ -4749,311 +4799,311 @@ msgstr "buscando \"%s\" de %s servidor %s\n"
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "enviando clave %s a %s servidor %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 msgid "no keyserver action!\n"
 msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVISO: el manejo de claves procede de una versi�n diferente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr "el servidor de claves no envi� VERSION\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "no se pueden realizar llamadas a un servidor externo de claves tal y\n"
 "como est� compilado el programa\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "la acci�n `%s' no es posible con este esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s no permite usar la versi�n %d del manejador\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 msgid "keyserver timed out\n"
 msgstr "agotado el tiempo de espera para el servidor de claves\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 msgid "keyserver internal error\n"
 msgstr "error interno del servidor de claves\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "error de comunicaci�n con el servidor de claves: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "renovando 1 clave de %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "renovando %d claves desde %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o anormal para una clave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s clave de sesi�n cifrada\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "frase contrase�a generada con algoritmo de resumen desconocido %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave p�blica es %s\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$s, creada el %4$s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contrase�a\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contrase�a\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firmado el %s usando clave %s ID %s\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "AVISO: detectadas m�ltiples firmas. S�lo la primera se comprueba.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
@@ -5087,55 +5137,65 @@ msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVISO: el algoritmo de resumen %s es una opci�n desaconsejada\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = por favor mu�streme m�s informaci�n\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "este mensaje podr�a no ser utilizable por %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
@@ -5192,7 +5252,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(ID de clave primaria %s)"
@@ -5220,12 +5280,12 @@ msgstr "Introduzca frase contrase�a\n"
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5234,12 +5294,12 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%s\"\n"
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subclave en clave principal ID %s)"
@@ -5289,23 +5349,23 @@ msgstr "�Es correcta la foto? (s/n) "
 msgid "unable to display photo ID!\n"
 msgstr "�no puedo mostrar ID fotogr�fico!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "No se dio ninguna raz�n"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "La clave ha sido reemplazada."
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "La clave ha sido comprometida"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "La clave ya no est� en uso"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es v�lido"
 
@@ -5373,7 +5433,7 @@ msgstr ""
 "El m�nimo nivel de confianza para esta clave es: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "�Su decisi�n? "
 
@@ -5417,110 +5477,110 @@ msgstr ""
 "identificador de usuario. Si *realmente* sabe lo que est� haciendo,\n"
 "puede contestar s� a la siguiente pregunta.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "�Usar esta clave de todas formas? (s/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCI�N: �Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVISO: la clave puede estar revocada (falta clave de revocaci�n)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
 "como revocador!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Esto puede significar que la firma est� falsificada.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta clave est� deshabilitada.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave ha caducado!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "          No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada con firmas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave p�blica ya presente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr "Destinatarios actuales:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5528,42 +5588,42 @@ msgstr ""
 "\n"
 "Introduzca ID de usuario. Acabe con una l�nea vac�a: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "omitida: clave p�blica ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "omitida: clave p�blica ya establecida\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "desconocido el destinatario predefinido \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "clave %s: sin identificador de usuario\n"
@@ -5572,27 +5632,32 @@ msgstr "clave %s: sin identificador de usuario\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Firma separada.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "no hay datos firmados\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "imposible abrir datos firmados `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5626,7 +5691,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "construcci�n del paquete fallida: %s\n"
@@ -5648,11 +5713,11 @@ msgstr "(Este es una clave de revocaci�n confidencial)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "se fuerza salida con armadura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fall�: %s\n"
@@ -5666,33 +5731,33 @@ msgstr "Certificado de revocaci�n creado.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no existe la clave p�blica correspondiente: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "�la clave p�blica y la privada no se corresponden!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desconocido\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta clave no est� protegida!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5711,33 +5776,33 @@ msgstr ""
 "de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
 "a otras personas!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor elija una raz�n para la revocaci�n:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raz�n para la revocaci�n: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(No se di� descripci�n)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr "�Es correcto? (s/N) "
 
@@ -5912,13 +5977,13 @@ msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s firma de: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
 "pgp2\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5926,15 +5991,15 @@ msgstr ""
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
@@ -6322,7 +6387,7 @@ msgstr ""
 "no se puede actualizar el registro de la versi�n de la base de datos\n"
 "de confianza: fallo de escritura: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6332,11 +6397,16 @@ msgstr ""
 "Por favor recuerde que el fichero de firma (.sig o .asc)\n"
 "deber�a ser el primero que se da en la l�nea de �rdenes.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "la l�nea %u es demasiado larga o no tiene avance de l�nea (LF)\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "no se puede abrir `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6400,52 +6470,61 @@ msgstr "fallo guardando la fecha de creaci�n: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "fallo leyendo la clave\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave p�blica\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el m�dulo RSA\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la respuesta no incluye el exponente p�blico RSA\n"
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "PIN [firmas hechas: %lu]"
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "PIN [firmas hechas: %lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificaci�n CHV%d fall�: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr "el acceso a �rdenes de administrador no est� configurado\n"
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6455,108 +6534,107 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Administrador"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 msgid "error reading fingerprint DO\n"
 msgstr "error leyendo huella digital DO\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr "la clave existente ser� reemplazada\n"
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponente p�blico demasiado grande (m�s de 32 bits)\n"
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 msgid "generating key failed\n"
 msgstr "la generaci�n de la clave fall�\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:2235
-#, fuzzy, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "PIN [firmas hechas: %lu]"
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
@@ -6623,7 +6701,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter inv�lido radix64 %02X omitido\n"
@@ -6647,148 +6725,148 @@ 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:159
+#: sm/certchain.c:165
 #, 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:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "no se permite exportar claves secretas\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Clave disponible en: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema en la lectura del certificado: %s\n"
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificado: %s\n"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 #, 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:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Huella dactilar CA:"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 #, 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:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, 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:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una firma"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6951,7 +7029,7 @@ msgstr "certificado duplicado - eliminado"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(No se di� descripci�n)\n"
@@ -7006,10 +7084,6 @@ msgstr "Certificado correcto"
 msgid "register a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7172,29 +7246,39 @@ msgstr "uso: gpgm [opciones] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no se puede acceder a `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "el agente gpg no esta disponible en esta sesi�n\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Por favor seleccione tipo de clave que generar:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8055,18 +8139,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 #~ msgstr "no se puede ejecutar el programa `%s': %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "ID de usuario \"%s\" revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "ID de usuario \"%s\" revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "ID de usuario \"%s\" revocado."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "No hay clave secreta para tal usuario\n"
 
diff --git a/po/et.po b/po/et.po
index 2b9de2bc5..f583cceda 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -32,36 +32,41 @@ msgid ""
 "this session"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "halb parool"
@@ -71,21 +76,21 @@ msgstr "halb parool"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -156,29 +161,50 @@ msgstr "parooli ei korratud �ieti; proovige uuesti"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Kasutan seda v�tit ikka? "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Sisestage parool\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuda parooli"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -189,252 +215,252 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -462,40 +488,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Katkesta"
@@ -654,12 +680,12 @@ msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
@@ -725,77 +751,77 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "vigane pakendi p�is: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "pakendi p�is: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "vigane avateksti allkirja p�is\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "avateksti allkirjad �ksteise sees\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "ootamatu pakend:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "vigane kriipsudega m�rgitud rida: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "enneaegne failil�pp (puudub CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "enneaegne failil�pp (poolik CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC viga; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "enneaegne failil�pp (l�petaval real)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "viga l�petaval real\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -848,8 +874,8 @@ msgstr "salajane v�ti ei ole k�ttesaadav"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
@@ -923,7 +949,7 @@ msgstr "vastavat avalikku v�tit pole: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -1035,7 +1061,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
@@ -1059,7 +1085,7 @@ msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
@@ -1068,7 +1094,7 @@ msgstr "v�lju sellest men��st"
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
@@ -1125,7 +1151,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "K�sklus> "
 
@@ -1144,27 +1170,27 @@ msgstr "vastuolulised k�sud\n"
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
@@ -1206,53 +1232,53 @@ msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K moodi t�ttu ei saa s�mmeetrilist ESK paketti kasutada\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "kasutan �iffrit %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "RSA v�tmeid pikkusega kuni 2048 bitti saab kr�pteerida ainult --pgp2 moodis\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "k�ikide kr�pteeritavate v�tmetega ei saa IDEA �iffrit kasutada.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1260,38 +1286,38 @@ msgid ""
 msgstr ""
 "pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �ifri n�rga v�tmega.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "probleem kr�ptitud paketi k�sitlemisel\n"
 
@@ -1387,41 +1413,41 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
@@ -1447,7 +1473,7 @@ msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
@@ -1462,7 +1488,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1470,128 +1496,132 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1602,47 +1632,47 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1650,7 +1680,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1670,15 +1700,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1688,7 +1718,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1696,552 +1726,552 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -2619,421 +2649,421 @@ msgstr "mittekasutatav salajane v�ti"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu v�tit on seni t��deldud\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele j�etud uusi v�tmeid: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamv�tmeid: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
@@ -3142,12 +3172,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
@@ -3358,8 +3388,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
@@ -3368,20 +3398,20 @@ msgstr "allkirjastamine eba�nnestus: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
@@ -3398,11 +3428,11 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3410,206 +3440,206 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3617,241 +3647,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See k�sklus ei ole %s moodis lubatud.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3859,19 +3889,19 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3879,7 +3909,7 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3888,55 +3918,75 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Kasutaja ID \"%s\" on t�histatud."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Kasutaja ID \"%s\" on t�histatud."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Kasutaja ID \"%s\" on t�histatud."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3945,197 +3995,197 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
@@ -4178,12 +4228,12 @@ msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
@@ -4486,7 +4536,7 @@ msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4494,12 +4544,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4511,7 +4561,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4523,50 +4573,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4576,43 +4626,43 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
@@ -4758,7 +4808,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi v�tmed\n"
@@ -4793,311 +4843,311 @@ msgstr "otsin \"%s\" HKP serverist %s\n"
 msgid "searching for names from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "veider suurus kr�ptitud sessiooni v�tme jaoks (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kr�pteeritud sessiooni v�ti\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kr�pteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "kr�pteeritud �he parooliga\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA �iffer pole saadaval, loodan kasutada selle asemel %s\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "V�tme leiate: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -5132,56 +5182,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = esita palun t�iendavat infot\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
@@ -5240,7 +5300,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
@@ -5268,12 +5328,12 @@ msgstr "Sisestage parool\n"
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5283,12 +5343,12 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5339,23 +5399,23 @@ msgstr "On see foto �ige (j/E/v)? "
 msgid "unable to display photo ID!\n"
 msgstr "foto ID ei saa n�idata!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "P�hjus puudub"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "V�ti on asendatud"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "V�ti on kompromiteeritud"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "V�ti ei ole enam kasutusel"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
@@ -5426,7 +5486,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Teie otsus? "
 
@@ -5470,109 +5530,109 @@ msgstr ""
 "v�ite j�rgnevale k�simusele vastata jaatavalt\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Kasutan seda v�tit ikka? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "HOIATUS: see v�ti v�ib olla t�histatud (t�histamise v�tit pole)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         See v�ib t�hendada, et allkiri on v�ltsing.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "M�rkus: See v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "M�rkus: See v�ti on aegunud!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allkiri on t�en�oliselt V�LTSING.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava "
 "allkirjaga!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Te ei m��ranud kasutaja IDd. (v�ite kasutada v�tit \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5580,42 +5640,42 @@ msgstr ""
 "\n"
 "Sisestage kasutaja ID.  L�petage t�hja reaga: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Avalik v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
@@ -5624,27 +5684,32 @@ msgstr "v�ti %08lX: kasutaja ID puudub\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5678,7 +5743,7 @@ msgid "NOTE: key has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet eba�nnestus: %s\n"
@@ -5701,11 +5766,11 @@ msgstr "(See on tundlik t�histamise v�ti)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet eba�nnestus: %s\n"
@@ -5721,34 +5786,34 @@ msgstr ""
 "`%s' jaoks pole t�histamise v�tmeid\n"
 "\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salajast v�tit `%s' ei leitud: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "M�RKUS: See v�ti ei ole kaitstud!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5769,33 +5834,33 @@ msgstr ""
 "tr�kis�steem\n"
 "v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(T�en�oliselt soovite siin valida %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "T�histamise p�hjus: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "On see h�sti? "
@@ -5963,28 +6028,28 @@ msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
@@ -6369,7 +6434,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6379,11 +6444,16 @@ msgstr ""
 "Palun pidage meeles, et allkirja fail (.sig v�i .asc)\n"
 "peab olema k�sureal esimene fail.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "`%s' ei �nnestu avada: %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6447,52 +6517,61 @@ msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6500,113 +6579,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genereeri uus v�tmepaar"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -6673,7 +6751,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
@@ -6697,139 +6775,139 @@ 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:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "V�tme leiate: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "See v�ti on aegunud!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "n�ita s�rmej�lge"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "kontrolli allkirja"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6992,7 +7070,7 @@ msgstr "eelistus %c%lu on duplikaat\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Kirjeldust ei antud)\n"
@@ -7046,10 +7124,6 @@ msgstr "halb sertifikaat"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7206,29 +7280,39 @@ msgstr "kasuta: gpg [v�tmed] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8027,18 +8111,6 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 #~ msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Kasutaja ID \"%s\" on t�histatud."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Kasutaja ID \"%s\" on t�histatud."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Kasutaja ID \"%s\" on t�histatud."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
diff --git a/po/fi.po b/po/fi.po
index 8f6fb9a0c..5716941be 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -48,36 +48,41 @@ msgid ""
 "this session"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "väärä salasana"
@@ -87,21 +92,21 @@ msgstr "väärä salasana"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -172,29 +177,50 @@ msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Syötä salasana\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -205,104 +231,104 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
@@ -310,148 +336,148 @@ msgid "Please report bugs to <"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, 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:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -479,40 +505,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Peru"
@@ -671,12 +697,12 @@ msgstr "gpg-agentin kanssa yhteysongelma\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
@@ -742,77 +768,77 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "ascii-koodaus: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "epäkelpo ascii-koodausotsake: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "ascii-koodausotsake: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "epäkelpo selkotekstisen allekirjoituksen otsikko\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "sisäkkäisiä tekstimuotoisia allekirjoituksia\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "odottamaton ascii-koodaus:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "epäkelpo viiva rivin lopussa: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "väärinmuotoiltu CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-virhe; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "virhe trailer-rivissä\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -867,8 +893,8 @@ msgstr "salaista avainta ei löydy"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
@@ -942,7 +968,7 @@ msgstr "ei vastaavaa julkista avainta: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -1054,7 +1080,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
@@ -1078,7 +1104,7 @@ msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
@@ -1087,7 +1113,7 @@ msgstr "ulos tästä valikosta"
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
@@ -1144,7 +1170,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Komento> "
 
@@ -1163,27 +1189,27 @@ msgstr "ristiriitainen komento\n"
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
@@ -1225,91 +1251,91 @@ msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "symmetristä ESK-pakettia ei voi käyttää S2K-tilan vuoksi\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "käytetään salakirjoitusalgoritmia %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2-tilassa voidaan salata korkeintaan 2048-bittisillä RSA-avaimilla\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "luetaan kohteesta \"%s\"\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kaikille salattaville avaimille ei voi käyttää IDEA-salainta.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VAROITUS: viesti salattiin symmetrisessä salaimessa \n"
 "esiintyvällä heikolla avaimella.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "ongelma käsiteltäessä salattua pakettia\n"
 
@@ -1402,43 +1428,43 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "avain %08lX: ei suojattu - ohitetaan\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "VAROITUS: salaisella avaimella %08lX ei ole yksinkertaista SK-"
 "tarkistussummaa\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
@@ -1463,7 +1489,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
@@ -1481,7 +1507,7 @@ msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1489,128 +1515,132 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1621,47 +1651,47 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1670,7 +1700,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1689,16 +1719,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1708,7 +1738,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1716,553 +1746,553 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 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:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -2648,424 +2678,424 @@ msgstr "salaista avainta ei voi käyttää"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ohitetaan tyypin %d lohko\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ilman käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              tuotu: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             muuttamatonta: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          uusia käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           uusia aliavaimia: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   uusia avainten mitätöintejä: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ei tuotu: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainrenkaassa\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "avain %08lX: salaista avainta ei löydy: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
 "ei saatavilla.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
@@ -3175,12 +3205,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
@@ -3393,8 +3423,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -3403,20 +3433,20 @@ msgstr "allekirjoitus epäonnistui: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
@@ -3433,11 +3463,11 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3445,206 +3475,206 @@ msgstr ""
 "Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Haluatko varmasti tehdä tämän? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3652,241 +3682,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3894,19 +3924,19 @@ msgstr ""
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3914,7 +3944,7 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3923,55 +3953,75 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Käyttäjätunnus \"%s\" on mitätöity."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Käyttäjätunnus \"%s\" on mitätöity."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Käyttäjätunnus \"%s\" on mitätöity."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3981,199 +4031,199 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX mitätöi tämän %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
 "tulevaisuuteen\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4218,12 +4268,12 @@ msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
@@ -4528,7 +4578,7 @@ msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4536,12 +4586,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4553,7 +4603,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4565,50 +4615,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4617,12 +4667,12 @@ msgstr ""
 "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4630,7 +4680,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4638,26 +4688,26 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -4805,7 +4855,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
@@ -4840,317 +4890,317 @@ msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 msgid "searching for names from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-salain ei käytettävissä, yritetään optimistisesti \n"
 "käyttää sen sijaan salainta %s\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 "Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
 "tarkistaa.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
@@ -5186,56 +5236,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = näytä lisätietoja\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
@@ -5294,7 +5354,7 @@ msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
@@ -5322,12 +5382,12 @@ msgstr "Syötä salasana\n"
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5336,12 +5396,12 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5393,23 +5453,23 @@ msgstr "Onko tämä oikein (k/E/l)? "
 msgid "unable to display photo ID!\n"
 msgstr "valokuvatunnistetta ei voi näyttää!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "Avain on uusittu"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "Avain on murrettu"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "Avain ei ole enää käytössä"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "Käyttäjätunnus ei ole enää käytössä"
 
@@ -5480,7 +5540,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Valintasi? "
 
@@ -5528,114 +5588,114 @@ msgstr ""
 "kysymykseen kyllä\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "VAROITUS: tämä avain saattaa olla mitätöity (mitätöintiavainta ei "
 "saatavilla)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tämä voi merkitä sitä, että allekirjoitus on väärennös.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Huom: Tämä avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Huom: Tämä avain on vanhentunut!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
 "allekirjoituksella!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5643,42 +5703,42 @@ msgstr ""
 "\n"
 "Syötä käyttäjätunnus.  Lopeta tyhjällä rivillä: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Käyttäjätunnusta ei löydy.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "ohitettu: julkinen avain on jo asetettu\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "ei kelvollisia vastaanottajia\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@ -5688,27 +5748,32 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dataa ei ole tallennettu, käytä valitsinta \"--output\" tallentaaksesi\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Erillinen allekirjoitus.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Anna datatiedoston nimi: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "luetaan vakiosyötettä ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "ei allekirjoitettua dataa\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5742,7 +5807,7 @@ msgid "NOTE: key has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet epäonnistui: %s\n"
@@ -5765,11 +5830,11 @@ msgstr "(Tämä on arkaluonteinen mitätöintiavain)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-koodattu tuloste määritetty.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet epäonnistui: %s\n"
@@ -5783,34 +5848,34 @@ msgstr "Mitätöintivarmenne luotu.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "HUOM: Tätä avainta ei ole suojattu!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5830,33 +5895,33 @@ msgstr ""
 "tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
 "saataville!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Peru"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Todennäköisesti haluat valita %d tässä)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Mitätöinnin syy: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Kelpaako tämä? "
@@ -6036,30 +6101,30 @@ msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
@@ -6446,7 +6511,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6456,11 +6521,16 @@ msgstr ""
 "Muista, että allekirjoitustiedosto (.sig tai .asc)\n"
 "tulee antaa komentorivillä ensimmäisenä.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6525,52 +6595,61 @@ msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6578,114 +6657,113 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -6752,7 +6830,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
@@ -6776,139 +6854,139 @@ msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Avain saatavilla kohteessa: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näytä sormenjälki"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "tarkista allekirjoitus"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7071,7 +7149,7 @@ msgstr "valinta %c%lu on kopio\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Kuvausta ei annettu)\n"
@@ -7125,10 +7203,6 @@ msgstr "virheellinen varmenne"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7285,29 +7359,39 @@ msgstr "käyttö: gpg [valitsimet] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Valitse millaisen avaimen haluat:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8108,18 +8192,6 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 #~ msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Käyttäjätunnus \"%s\" on mitätöity."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Käyttäjätunnus \"%s\" on mitätöity."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Käyttäjätunnus \"%s\" on mitätöity."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
diff --git a/po/fr.po b/po/fr.po
index 4a870ad34..0b4d4b720 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -37,36 +37,41 @@ msgid ""
 "this session"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "mauvaise phrase de passe"
@@ -76,21 +81,21 @@ msgstr "mauvaise phrase de passe"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -164,7 +169,28 @@ msgstr "le code PIN n'a pas �t� correctement r�p�t� ; recommencez"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Utiliser cette cl� quand m�me ? (o/N) "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Entrez la phrase de passe\n"
+
+#: agent/genkey.c:146
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
@@ -172,22 +198,22 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -198,106 +224,106 @@ msgstr ""
 "Options:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: 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:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
@@ -306,150 +332,150 @@ msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, 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:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, 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:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, 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:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, 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:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignor�: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, 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:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 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:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -477,40 +503,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "mauvaise phrase de passe"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "annul�"
@@ -670,12 +696,12 @@ msgstr ""
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
@@ -744,75 +770,75 @@ msgstr "oO"
 msgid "cC"
 msgstr "aA"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "armure: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "en-t�te d'armure invalide: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "en-t�te d'armure: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "en-t�te de signature claire invalide\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriqu�es\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 msgid "unexpected armor: "
 msgstr "armure inattendue: "
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "ligne �chapp�e par `-' invalide: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caract�re %02X invalide en radix64 ignor�\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erreur de CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caract�res\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -865,8 +891,8 @@ 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:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
@@ -934,7 +960,7 @@ msgstr "URL pour r�cup�rer la cl� publique: %s"
 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:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -1043,7 +1069,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
@@ -1063,7 +1089,7 @@ msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
@@ -1071,7 +1097,7 @@ msgstr "quitter ce menu"
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "afficher cette aide"
 
@@ -1125,7 +1151,7 @@ msgstr "menu pour changer ou d�verrouiller le PIN"
 msgid "verify the PIN and list all data"
 msgstr "v�rifier le code PIN et lister toutes les donn�es"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Commande> "
 
@@ -1141,27 +1167,27 @@ msgstr "Les commandes d'administration sont permises\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
@@ -1200,50 +1226,50 @@ msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "il n'est pas possible d'utiliser un paquet ESK sym�trique en mode S2K\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "utilisation de l'algorithme de chiffrement %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "le chiffrement RSA ne se fait qu'avec des cl�s de moins de 2048 bits\n"
 "en mode --pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossible d'utiliser le chiffre IDEA pour toutes les cl�s vers\n"
 "lesquelles vous chiffrez.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1251,7 +1277,7 @@ msgstr ""
 "AVERTISSEMENT: forcer le chiffrement sym�trique %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1260,41 +1286,41 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de compression %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
 "avec les pr�ferences du destinataire\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffr� pour: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENTION: Le message a �t� chiffr� avec une cl� faible pendant le\n"
 "chiffrement sym�trique.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "probl�me de gestion des paquets chiffr�s\n"
 
@@ -1389,42 +1415,42 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 msgid "exporting secret keys not allowed\n"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cl� %s: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cl� %s: cl� de style PGP 2.x - ignor�e\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVERTISSEMENT: la cl� secr�te %s n'a pas de somme de contr�le SK\n"
 "simple\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
@@ -1449,7 +1475,7 @@ msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
@@ -1466,7 +1492,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1474,127 +1500,131 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1605,47 +1635,47 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1653,7 +1683,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1673,17 +1703,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1693,7 +1723,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:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1701,85 +1731,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1787,21 +1817,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour l'extension `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1809,479 +1839,479 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, 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:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, 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:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, 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:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'extension de chiffrement `%s' n'a pas �t� charg�e car ses\n"
 "permissions sont peu s�res\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, 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:2472
+#: g10/gpg.c:2511
 #, 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:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, 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:2510
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, 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:2562
+#: g10/gpg.c:2601
 #, 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:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, 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:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 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:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 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:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 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:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, 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:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, 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:3540
+#: g10/gpg.c:3589
 #, 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:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 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"
 
@@ -2675,428 +2705,428 @@ msgstr "nettoyer les parties inutilisables de la cl�"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nouvelles cl�s ignor�es: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  non import�e: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "          signatures nettoy�es: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   noms d'utilisateur nettoy�s: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "AVERTISSEMENT: la cl� %s contient des pr�ferences pour des\n"
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "il est fortement sugg�r� de mettre � jour vos pr�f�rences et\n"
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "redistribuer cette cl� pour �viter les probl�mes potentiels qui seraient\n"
 "caus�s par des algorithmes non appropri�s\n"
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "vous pouvez mettre � jour vos pr�f�rences avec: \n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cl� %s: cl� publique non trouv�e: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cl� %s: cl� publique � %s � import�e\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cl� %s: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cl� %s: � %s � un nouvel utilisateur\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cl� %s: � %s � une nouvelle signature\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cl� %s: � %s � %d nouvelles signatures\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cl� %s: � %s � %d nom d'utilisateur nettoy�\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cl� %s: � %s � %d noms d'utilisateur nettoy�s\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cl� %s: � %s � n'a pas chang�\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cl� %s: cl� secr�te import�e\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cl� %s: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur � %s �\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cl� %s: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cl� %s: sous-cl� non prise en compte\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
 "la cl� de r�vocation %s\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
 "r�vocation %s est absente.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTE: le num�ro de s�rie d'une cl� n'est pas celui de la carte\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTE: la cl� primaire est en ligne et stock�e sur la carte\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTE: la cl� secondaire est en ligne et stock�e sur la carte\n"
 
@@ -3208,12 +3238,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
@@ -3404,8 +3434,8 @@ msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
@@ -3416,21 +3446,21 @@ msgstr ""
 "La cl� poss�de seulement des items partiels ou stock�s sur carte -\n"
 "pas de phrase de passe � changer.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 "Les parties secr�tes de la cl� principale sont stock�es sur la\n"
 "carte.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
@@ -3445,11 +3475,11 @@ msgid ""
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3458,198 +3488,198 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte de la cl�"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 msgid "select subkey N"
 msgstr "s�lectionner la sous-cl� N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 msgid "check signatures"
 msgstr "v�rifier les signatures"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s [* voir ci-dessous pour\n"
 "les commandes similaires]"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs locally"
 msgstr "signer le nom d'utilisateur s�lectionn� localement"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr "signer les noms d'utilisateurs s�lectionn�s localement"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s avec une signature\n"
 "non-r�vocable"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 msgid "delete selected user IDs"
 msgstr "enlever les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 msgid "add a subkey"
 msgstr "ajouter une sous-cl�"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr "d�placer une cl� de sauvegarde vers une carte � puce"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 msgid "delete selected subkeys"
 msgstr "enlever les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 msgid "delete signatures from the selected user IDs"
 msgstr "enlever les signatures des noms d'utilisateur s�lectionn�s "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "changer la date d'expiration de la cl� ou des sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr "marquer le nom d'utilisateur s�lectionn� comme principal"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 msgid "toggle between the secret and public key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "indiquer l'URL du serveur de cl�s pr�f�r� pour les noms d'utilisateur\n"
 "s�lectionn�s"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "changer la phrase de passe"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke signatures on the selected user IDs"
 msgstr "r�voquer les signatures des noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "revoke selected user IDs"
 msgstr "r�voquer les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 msgid "enable key"
 msgstr "activer la cl�"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 msgid "disable key"
 msgstr "d�sactiver la cl�"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr "montrer les photos d'identit� s�lectionn�es"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� secr�te � %s �: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3661,158 +3691,158 @@ msgstr ""
 "(tsign), par `nr' pour les signatures non-r�vocables (nrsign), ou\n"
 "bien toute combinaison possible (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Type de signature `%s' inconnu\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Enlever r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever r�ellement la cl� principale ? (o/N) "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez s�lectionner exactement une cl�.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr "La commande attend un nom de fichier comme argument\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Erreur durant la lecture de la cl� de sauvegarde de `%s' : %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 msgid "Really revoke this user ID? (y/N) "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer la cl� enti�re ? (o/N) "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer les sous-cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette sous-cl� ? (o/N) "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confiance du propri�taire peut ne pas �tre positionn�e en utilisant\n"
 "la base de confiance d'un tiers\n"
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr "Changer la liste de pr�f�rences en :\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? (o/N) "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3820,73 +3850,73 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Il n'y a pas de pr�f�rences dans un nom d'utilisateur du style de\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Cette cl� a �t� r�voqu�e le %s par la cl� %s %s\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3894,17 +3924,17 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3913,7 +3943,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3923,55 +3953,75 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invalide"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "cl� %s: � %s � %d signature nettoy�e\n"
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3981,202 +4031,202 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de r�vocateur d�sign� � une cl� de style PGP2.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
 "d�sign�\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISSEMENT: l'�tablissement d'une cl� comme r�vocateur d�sign�\n"
 "est irr�versible !\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
 "d�sign� ? (o/N) "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une sous-cl�.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une sous-cl�.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'auto-signature v3 du nom d'utilisateur � %s � a �t� ignor�e\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notation de signature: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-cl� avec l'index %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "sign� par votre cl� %s � %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n"
 "dans le futur\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La cl� %s est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4221,12 +4271,12 @@ msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
@@ -4525,7 +4575,7 @@ msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4534,12 +4584,12 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4553,7 +4603,7 @@ msgstr ""
 "� --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4565,52 +4615,52 @@ msgstr ""
 "pendant la g�n�ration de nombres premiers; cela donne au g�n�rateur de\n"
 "nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique dans `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'une cl� secr�te partielle dans `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s public `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4619,13 +4669,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une sous-cl� �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4633,7 +4683,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4641,26 +4691,26 @@ msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "le stockage de la cl� dans la carte a �chou�: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
@@ -4807,7 +4857,7 @@ msgstr "d�sactiv�"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
@@ -4841,306 +4891,306 @@ msgstr "recherche de � %s � du serveur %s %s\n"
 msgid "searching for names from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "envoi de la cl� %s au serveur %s %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la cl� %s � %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de cl�s !\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISSEMENT: le gestionnaire de serveurs de cl�s provient d'une\n"
 "version diff�rente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "les appels externes � un serveur de cl� ne sont pas support�s dans\n"
 "cette compilation\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "l'action `%s' n'est pas support�e avec le type de serveurs\n"
 "de cl�s `%s'\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 msgid "keyserver timed out\n"
 msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de cl�s\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafra�chissement d'une cl� depuis %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafra�chissement de %d cl�s depuis %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "taille �tonnante pour une cl� de session chiffr�e (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "cl� de session chiffr�e %s\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "phrase de passe g�n�r�e avec l'algorithme de hachage %d inconnu\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, c-format
 msgid "public key is %s\n"
 msgstr "la cl� publique est %s\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es par cl� publique: bonne cl� de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "chiffr� avec une cl� de %u bits %s, ID %s, cr��e le %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      � %s �\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffr� avec une cl� %s, ID %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffr� avec %lu phrases de passe\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffr� avec 1 phrase de passe\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "L'algorithme IDEA n'est pas disponible, avec un peu de chance %s marchera\n"
 "peut-�tre\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISSEMENT: l'int�grit� du message n'�tait pas prot�g�e\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISSEMENT: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               en utilisant la cl� %s %s\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la cl� %s ID %s\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de � %s �"
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expir�e de � %s �"
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias � %s �"
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -5148,16 +5198,16 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -5197,57 +5247,67 @@ msgstr ""
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISSEMENT: l'algorithme de hachage %s est d�conseill�\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "AVERTISSEMENT: \"%s\" est une commande d�conseill�e - ne\n"
 "l'utilisez pas\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Non-compress�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
@@ -5306,7 +5366,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %s)"
@@ -5335,12 +5395,12 @@ msgstr "Entrez la phrase de passe\n"
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5349,12 +5409,12 @@ msgstr ""
 "Vous avez besoin d'une phrase de passe pour d�verrouiller la\n"
 "cl� secr�te pour l'utilisateur: � %s �\n"
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cl� de %u bits %s, ID %s, cr��e le %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (sous-cl� de la cl� principale ID %s)"
@@ -5405,23 +5465,23 @@ msgstr "Cette photo est-elle correcte (o/N/q) ? "
 msgid "unable to display photo ID!\n"
 msgstr "impossible d'afficher la photo d'identit� !\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Aucune raison sp�cifi�e"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "La cl� a �t� remplac�e"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "La cl� a �t� compromise"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "La cl� n'est plus utilis�e"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
@@ -5489,7 +5549,7 @@ msgstr ""
 "Le niveau de confiance minimal pour cette cl� est: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
@@ -5534,115 +5594,115 @@ msgstr ""
 "vous pouvez r�pondre oui � la prochaine question.\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "Utiliser cette cl� quand m�me ? (o/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION: Utilisation d'une cl� sans confiance !\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVERTISSEMENT: cette cl� est peut-�tre r�voqu�e (cl� de r�vocation\n"
 "absente)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTISSEMENT: Cette cl� � �t� r�voqu�e par son r�vocateur d�sign� !\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "           Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette sous-cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: cette cl� a �t� d�sactiv�e.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Note: Cette cl� a expir� !\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "           Rien ne dit que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION: Nous ne faisons PAS confiance � cette cl� !\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "           La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante !\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "            Il n'est pas s�r que la signature appartient � son "
 "propri�taire.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignor�: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Vous n'avez pas sp�cifi� de nom d'utilisateur. (vous pouvez\n"
 "utiliser �-r�)\n"
 "\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr "R�cipients actuels:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5650,42 +5710,42 @@ msgstr ""
 "\n"
 "Entrez le nom d'utilisateur, en terminant par une ligne vide: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "ignor�: cl� publique d�j� activ�e\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinataire par d�faut � %s � inconnu\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
@@ -5696,27 +5756,32 @@ msgstr ""
 "les donn�es ne sont pas enregistr�es; utilisez l'option �--output� pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Signature d�tach�e.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5752,7 +5817,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a �chou�: %s\n"
@@ -5774,11 +5839,11 @@ msgstr "(c'est une cl� de r�vocation sensible)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation d�sign�e pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "sortie avec armure ASCII forc�e.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a �chou�: %s\n"
@@ -5792,33 +5857,33 @@ msgstr "Certificat de r�vocation cr��.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "aucune cl� de r�vocation trouv�e pour � %s �\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "la cl� secr�te � %s � n'a pas �t� trouv�e: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "pas de cl� publique correspondante: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "algorithme de protection inconnu\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTE: Cette cl� n'est pas prot�g�e !\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5838,33 +5903,33 @@ msgstr ""
 "le syst�me d'impression de votre machine pourrait stocker ces\n"
 "donn�es et les rendre accessibles � d'autres personnes !\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "choisissez la cause de la r�vocation:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Annuler"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Vous devriez s�rement s�lectionner %d ici)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Entrez une description optionnelle ; terminez-l� par une ligne vide:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Cause de r�vocation: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr "Est-ce d'accord ? (o/N) "
 
@@ -6053,13 +6118,13 @@ msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de: � %s �\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
 "style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6067,17 +6132,17 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n"
 "d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature en texte clair avec des cl�s\n"
 "de style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
@@ -6474,7 +6539,7 @@ msgstr ""
 "impossible de mettre � jour l'enregistrement de version de la\n"
 "base de confiance: l'�criture a �chou�: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6484,13 +6549,18 @@ msgstr ""
 "Rappelez-vous bien que le fichier de signature (.sig ou .asc)\n"
 "doit �tre le premier fichier indiqu� sur la ligne de commande.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "la ligne d'entr�e %u est trop longue ou il manque un caract�re de saut\n"
 "de ligne\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "impossible d'ouvrir `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6556,54 +6626,63 @@ msgstr "impossible de stocker la date de cr�ation: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr "la r�ponse ne contient pas le modulo RSA\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6613,112 +6692,111 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr "|A|code PIN d'administration"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code PIN d'administration"
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code PIN"
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr "erreur pendant la lecture de donn�es d'application\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 msgid "error reading fingerprint DO\n"
 msgstr "erreur pendant la lecture de l'empreinte DO\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 msgid "key already exists\n"
 msgstr "la cl� existe d�j�\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr "la cl� existante sera remplac�e\n"
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 msgid "generating new key\n"
 msgstr "g�n�rer une nouvelle cl�\n"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr "l'horodatage de cr�ation est manquant\n"
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "l'exposant public RSA est manquant ou trop �lev� (plus de %d bits)\n"
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n"
 "%d bits\n"
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr "attendez que la cl� se g�n�re...\n"
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 msgid "generating key failed\n"
 msgstr "la g�n�ration de la cl� a �chou�\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "la g�n�ration de cl� a �t� effectu�e (%d secondes)\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "la v�rification du code PIN d'administration est actuellement interdite\n"
 "au travers de cette commande\n"
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
@@ -6782,7 +6860,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caract�re %02X invalide en radix64 ignor�\n"
@@ -6806,139 +6884,139 @@ 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:159
+#: sm/certchain.c:165
 #, 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:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "mauvais certificat"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cl� disponible sur: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Cette cl� a expir� !"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "empreinte de l'autorit� de certification: "
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, 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:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "v�rifier une signature"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7104,7 +7182,7 @@ msgstr "pr�f�rence `%s' dupliqu�e\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Aucune description donn�e)\n"
@@ -7161,10 +7239,6 @@ msgstr "mauvais certificat"
 msgid "register a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7329,29 +7403,39 @@ msgstr "utilisation: gpg [options] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent n'est pas disponible dans cette session\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
diff --git a/po/gl.po b/po/gl.po
index 1cfd564c0..69b67f295 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -32,36 +32,41 @@ msgid ""
 "this session"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "li�a longa de m�is\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non v�lido no nome\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI err�neo"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal err�neo"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "contrasinal err�neo"
@@ -71,21 +76,21 @@ msgstr "contrasinal err�neo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -157,29 +162,50 @@ msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "�Empregar esta chave de t�dolos xeitos?"
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Introduza o contrasinal\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -190,106 +216,106 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, 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:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
@@ -298,148 +324,148 @@ msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, 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:1373
+#: agent/gpg-agent.c:1379
 #, 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:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, 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:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -467,40 +493,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal err�neo"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancelar"
@@ -659,12 +685,12 @@ msgstr "problema de comunicaci�n con gpg-agent\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
@@ -730,77 +756,77 @@ msgstr ""
 msgid "cC"
 msgstr "v"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "cabeceira de armadura non v�lida: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "cabeceira de armadura: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "cabeceira de sinatura en claro non v�lida\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "sinaturas en texto claro ani�adas\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "li�a escapada cunha barra non v�lida: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "fin de ficheiro prematura (non hai CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "fin de ficheiro prematura (no CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "CRC mal formado\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "error nunha li�a adicional\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -854,8 +880,8 @@ msgstr "a chave secreta non est� dispo�ible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
@@ -929,7 +955,7 @@ msgstr "non hai unha chave p�blica correspondente: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -1041,7 +1067,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
@@ -1065,7 +1091,7 @@ msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
@@ -1074,7 +1100,7 @@ msgstr "sa�r deste men�"
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "amosar esta axuda"
 
@@ -1131,7 +1157,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Comando> "
 
@@ -1150,27 +1176,27 @@ msgstr "comandos conflictivos\n"
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
@@ -1213,54 +1239,54 @@ msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "non se pode empregar un paquete sim�trico ESK debido ao modo S2K\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "s� pode cifrar a chaves RSA de 2048 bits ou menos en modo --pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "non se puido emprega-la cifra IDEA para t�dalas chaves �s que est� a "
 "cifrar.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1269,38 +1295,38 @@ msgstr ""
 "forza-lo algoritmo de compresi�n %s (%d) viola as preferencias do "
 "destinatario\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado sim�trico.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao manexa-lo paquete cifrado\n"
 
@@ -1394,42 +1420,42 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVISO: a chave secreta %08lX non ten unha suma de comprobaci�n SK simple\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
@@ -1454,7 +1480,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1470,7 +1496,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1478,128 +1504,132 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1610,47 +1640,47 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1658,7 +1688,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1678,17 +1708,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1698,7 +1728,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1706,556 +1736,556 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, 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:2472
+#: g10/gpg.c:2511
 #, 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:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, 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:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, 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:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, 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:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, 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:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 #, 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:3020
+#: g10/gpg.c:3059
 #, 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:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, 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:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 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:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -2634,432 +2664,432 @@ msgstr "chave secreta non utilizable"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       non importadas: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
@@ -3167,12 +3197,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
@@ -3382,8 +3412,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -3392,20 +3422,20 @@ msgstr "fallou a sinatura: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
@@ -3422,11 +3452,11 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3434,212 +3464,212 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3647,243 +3677,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "clase de sinatura desco�ecida"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3891,19 +3921,19 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3911,7 +3941,7 @@ msgstr ""
 "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3920,57 +3950,77 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "O ID de usuario \"%s\" est� revocado."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "O ID de usuario \"%s\" est� revocado."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "O ID de usuario \"%s\" est� revocado."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3980,204 +4030,204 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4221,12 +4271,12 @@ msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
@@ -4531,7 +4581,7 @@ msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4539,12 +4589,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4556,7 +4606,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4568,50 +4618,50 @@ msgstr ""
 "mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
 "n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4621,12 +4671,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4634,7 +4684,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4642,26 +4692,26 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -4807,7 +4857,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
@@ -4842,313 +4892,313 @@ msgstr "buscando \"%s\" no servidor HKP %s\n"
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o moi estra�o para unha chave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chave de sesi�n cifrada con %s\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "A cifra IDEA non est� dispo�ible, t�ntase empregar %s no seu canto\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: detect�ronse sinaturas m�ltiples. S� se ha comproba-la primeira.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
@@ -5185,56 +5235,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = amosar m�is informaci�n\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensaxe pode non ser utilizable por %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
@@ -5292,7 +5352,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
@@ -5320,12 +5380,12 @@ msgstr "Introduza o contrasinal\n"
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5335,12 +5395,12 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5391,23 +5451,23 @@ msgstr "�� esta foto correcta (s/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "A chave � obsoleta"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "Esta chave quedou descoberta"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "Xa non se emprega esta chave"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non � v�lido"
 
@@ -5478,7 +5538,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "�A s�a decisi�n? "
 
@@ -5524,114 +5584,114 @@ msgstr ""
 "respostar � seguinte pregunta cun \"si\"\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "�Empregar esta chave de t�dolos xeitos?"
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: �Empr�gase unha chave que non � de confianza!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a sinatura est� falsificada.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: �Esta subchave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave est� desactivada.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta chave xa caducou!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: �Esta chave non est� certificada cunha sinatura de confianza!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "       Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: �Esta chave NON � de confianza!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       Probablemente, a sinatura estea FALSIFICADA.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: �Esta chave non est� certificada con sinaturas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Non � seguro que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave p�blica xa est� presente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5639,43 +5699,43 @@ msgstr ""
 "\n"
 "Introduza o ID de usuario. Remate cunha li�a en branco: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "omitido: a chave p�blica xa est� estabrecida coma destinatario por defecto\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desactivada.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "omitido: chave p�blica xa estabrecida\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "non hai enderezos v�lidos\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
@@ -5684,27 +5744,32 @@ msgstr "chave %08lX: non hai ID de usuario\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "os datos non foron gardados; use a opci�n \"--output\" para gardalos\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Sinatura non adxunta.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Por favor, introduza o nome do ficheiro de datos: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "lendo de stdin ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "non hai datos asinados\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "non foi posible abri-los datos asinados `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5738,7 +5803,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "a chamada a build_packet fallou: %s\n"
@@ -5761,11 +5826,11 @@ msgstr "(Esta � unha chave de revocaci�n sensible)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "Forzouse unha sa�da con armadura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "a chamada a make_keysig_packet fallou: %s\n"
@@ -5779,34 +5844,34 @@ msgstr "Creouse o certificado de revocaci�n.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta chave non est� protexida!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5824,33 +5889,33 @@ msgstr ""
 "se volve ilexible. Pero te�a coidado: o sistema de impresi�n da s�a\n"
 "m�quina poder�a armacena-los datos e deix�rllelos dispo�ibles a outros.\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(probablemente queira seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo para a revocaci�n: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�� correcto? "
@@ -6033,28 +6098,28 @@ msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
 "pgp2\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
@@ -6444,7 +6509,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6454,12 +6519,17 @@ msgstr ""
 "Por favor, lembre que o ficheiro de sinatura (.sig ou .asc) deber�a\n"
 "se-lo primeiro ficheiro que se indique na li�a de comandos.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 "a li�a de entrada %u � longa de m�is ou f�ltalle a marca de fin de li�a\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "non se puido abrir `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6525,52 +6595,61 @@ msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6578,113 +6657,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
@@ -6751,7 +6829,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
@@ -6775,148 +6853,148 @@ 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:159
+#: sm/certchain.c:165
 #, 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:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chave dispo�ible en: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Pegada dactilar:"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 #, 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:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar unha sinatura"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7079,7 +7157,7 @@ msgstr "certificado duplicado - borrado"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Non se deu unha descrici�n)\n"
@@ -7133,10 +7211,6 @@ msgstr "Certificado correcto"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7293,29 +7367,39 @@ msgstr "uso: gpg [opci�ns] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Por favor, seleccione o tipo de chave que quere:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8132,18 +8216,6 @@ msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 #~ msgstr "non se puido executar %s \"%s\": %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "O ID de usuario \"%s\" est� revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "O ID de usuario \"%s\" est� revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "O ID de usuario \"%s\" est� revocado."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "Non hai un ID de usuario para a chave\n"
 
diff --git a/po/hu.po b/po/hu.po
index 6dafaddee..889c98f97 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -32,36 +32,41 @@ msgid ""
 "this session"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hib�s MPI"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelsz�"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "rossz jelsz�"
@@ -71,21 +76,21 @@ msgstr "rossz jelsz�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -156,29 +161,50 @@ msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "M�gis haszn�ljuk ezt a kulcsot? "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "�rja be a jelsz�t!\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -189,252 +215,252 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, 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:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, 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:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, 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:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, 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:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, 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:1373
+#: agent/gpg-agent.c:1379
 #, 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:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, 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:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 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:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -462,40 +488,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelsz�"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "M�gsem"
@@ -654,12 +680,12 @@ msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
 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:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
@@ -725,77 +751,77 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "P�nc�l: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "�rv�nytelen p�nc�lfejl�c: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "P�nc�lfejl�c: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "�rv�nytelen al��r�sfejl�c!\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "Egym�sba �gyazott olvashat�sz�veg-al��r�sok!\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "V�ratlan p�nc�l:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "�rv�nytelen k�t�jeles sor: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "Korai �llom�nyv�g (nincs CRC).\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "Hib�s form�j� CRC.\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hiba; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "Hiba a z�r� sorban!\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -848,8 +874,8 @@ msgstr "titkos kulcs nem �ll rendelkez�sre"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
@@ -923,7 +949,7 @@ msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -1035,7 +1061,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
@@ -1059,7 +1085,7 @@ msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
@@ -1068,7 +1094,7 @@ msgstr "kil�p�s ebb�l a men�b�l"
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
@@ -1125,7 +1151,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Parancs> "
 
@@ -1144,27 +1170,27 @@ msgstr "Egym�snak ellentmond� parancsok!\n"
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
@@ -1206,90 +1232,90 @@ msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "Nem tudok szimmetrikus ESK csomagot haszn�lni a S2K m�d miatt!\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s rejtjelez�st haszn�lok.\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "Csak 2048 bites, vagy r�videbb RSA kulcsokkal titkos�that --pgp2 m�dban!\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Olvasok a \"%s\" �llom�nyb�l.\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "Nem tudom az IDEA rejtjelez�t haszn�lni az �sszes c�mzett kulcshoz.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkos�tott adat.\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "FIGYELEM: Az �zenet szimmetrikus titkos�t�s�t gyenge kulccsal v�gezt�k.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "Probl�ma a titkos�tott csomag kezel�sekor!\n"
 
@@ -1383,41 +1409,41 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "%08lX kulcs: PGP 2.x st�lus� kulcs - kihagytam.\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszer� SK ellen�rz��sszege.\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
@@ -1443,7 +1469,7 @@ msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1459,7 +1485,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1467,128 +1493,132 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1599,47 +1629,47 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 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:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1647,7 +1677,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1667,15 +1697,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1685,7 +1715,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:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1693,553 +1723,553 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, 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:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, 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:2224
+#: g10/gpg.c:2262
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, 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:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, 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:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 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:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, 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:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 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:4123
+#: g10/gpg.c:4173
 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:4156
+#: g10/gpg.c:4206
 #, 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"
@@ -2625,424 +2655,424 @@ msgstr "haszn�lhatatlan titkos kulcs"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d t�pus� blokkot kihagyom.\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "     �sszesen feldolgoztam: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       �j kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    felh. azonos�t� n�lk�l: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                import�lva: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "               v�ltozatlan: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       �j felh. azonos�t�k: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              �j alkulcsok: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     �j kulcsvisszavon�sok: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  import�lt titkos kulcsok: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "v�ltozatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             nem import�lt: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "%08lX kulcs: M�r szerepel a titkoskulcs-karik�n.\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%08lX kulcs: Titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
 "azonos�t�n!\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "leh�vom a %08lX visszavon� kulcsot.\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "visszavon� kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
@@ -3151,12 +3181,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
@@ -3366,8 +3396,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
@@ -3376,20 +3406,20 @@ msgstr "Al��r�s sikertelen: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
@@ -3406,11 +3436,11 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3418,206 +3448,206 @@ msgstr ""
 "�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tilt�sa"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkez�sre �ll.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3625,241 +3655,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "A kulcsot visszavont�k."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Jel�l�s: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenci�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3867,19 +3897,19 @@ msgstr ""
 "K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3887,7 +3917,7 @@ msgstr ""
 "FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
 " azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3897,55 +3927,75 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3955,199 +4005,199 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "FIGYELEM: A kijel�lt visszavon� kulcs megad�sa nem csin�lhat� vissza!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "K�rem, t�vol�tsa el a kijel�l�seket a titkos kulcsokr�l!\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   al��rva %08lX �ltal %s%s%s id�pontban.\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
@@ -4190,12 +4240,12 @@ msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
@@ -4500,7 +4550,7 @@ msgstr ""
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4508,12 +4558,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4525,7 +4575,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4537,50 +4587,50 @@ msgstr ""
 "a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
 "gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4590,46 +4640,46 @@ msgstr ""
 "k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
@@ -4776,7 +4826,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�rv�nytelen export opci�k!\n"
@@ -4811,317 +4861,317 @@ msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 msgid "searching for names from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s titkos�tott munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilv�nos kulcs: %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Titkos�tva %u bites %s kulccsal, azonos�t�: %08lX, l�trehozva: %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkos�tott adatot felt�telezek.\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA rejtjelez� nem �ll rendelkez�sre, optimista m�don megpr�b�lok\n"
 "%s-t haszn�lni helyette.\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "Visszafejt�s rendben.\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "MEGJEGYZ�S: A felad� k�r�se: \"csak az �n szemeinek\".\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti f�jln�v: '%.*s'.\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "K�l�n�ll� visszavon�s. Haszn�lja a \"gpg --import\"-ot az alkalmaz�s�hoz!\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "FIGYELEM: T�bbsz�r�s al��r�st �rz�keltem. Csak az els�t ellen�rz�m.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x oszt�ly� k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
@@ -5157,56 +5207,66 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = tov�bbi inform�ci�kat k�rek\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opci�: \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
@@ -5265,7 +5325,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
@@ -5296,12 +5356,12 @@ msgstr "�rja be a jelsz�t!\n"
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5312,12 +5372,12 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5368,23 +5428,23 @@ msgstr "Ez a fot� megfelel� (i/N/k)? "
 msgid "unable to display photo ID!\n"
 msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Nincs megadva ok."
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "A kulcsot lecser�lt�k."
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "A kulcs kompromitt�l�dott."
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "A kulcs m�r nem haszn�latos."
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "A felhaszn�l�i azonos�t� m�r nem �rv�nyes."
 
@@ -5455,7 +5515,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Mit v�laszt? "
 
@@ -5501,110 +5561,110 @@ msgstr ""
 "a k�vetkez� k�rd�sre v�laszolhat igennel.\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "M�gis haszn�ljuk ezt a kulcsot? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "FIGYELEM: Nem b�zunk a kulcsban, amit haszn�lunk!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "FIGYELEM: a kulcsot visszavonhatt�k (visszavon� kulcs nincs jelen).\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Ez jelentheti azt, hogy az al��r�s hamis.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Megjegyz�s: Ez a kulcs le lett tiltva.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Megjegyz�s: Ez a kulcs lej�rt!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "FIGYELEM: Ez a kulcs nincs hiteles�tve megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "          Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "FIGYELEM: NEM b�zunk ebben a kulcsban!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Az al��r�s val�sz�n�leg HAMIS.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "FIGYELEM: Ez a kulcs nincs igazolva kell�k�ppen megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nem biztos, hogy az al��r�s a tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nem adott meg felhaszn�l�i azonos�t�t! (Haszn�lhatja a \"-r\" opci�t.)\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5612,43 +5672,43 @@ msgstr ""
 "\n"
 "Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva alap�rtelmezett c�mzettnek.\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "Nincsenek �rv�nyes c�mzettek!\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
@@ -5658,27 +5718,32 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Az adatot nem mentettem el. Haszn�lja az \"--output\" opci�t a ment�shez!\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "K�l�n�ll� al��r�s.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "Olvasom a szabv�nyos bemenetet...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "Nincs al��rt adat.\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5712,7 +5777,7 @@ msgid "NOTE: key has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet sikertelen: %s.\n"
@@ -5735,11 +5800,11 @@ msgstr "(Ez egy �rz�keny visszavon� kulcs.)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet sikertelen: %s\n"
@@ -5753,34 +5818,34 @@ msgstr "Visszavon� igazol�s l�trehozva.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "MEGJEGYZ�S: Ez a kulcs nem v�dett.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5798,33 +5863,33 @@ msgstr ""
 "adathordoz� olvashatatlann� v�lik. De vigy�zat: az �n g�p�nek nyomtat�si\n"
 "rendszere is t�rolhatja az adatot, �s m�sok esetleg hozz�f�rhetnek ehhez!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Val�sz�n�leg a(z) %d. lehet�s�get akarja v�lasztani.)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Visszavon�s oka: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ez �gy rendben van? "
@@ -6000,12 +6065,12 @@ msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6013,16 +6078,16 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
@@ -6409,7 +6474,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6419,11 +6484,16 @@ msgstr ""
 "Ne felejtse el, hogy az al��r�st tartalmaz� �llom�nyt (.sig vagy .asc)\n"
 "kell az els� helyre �rni a parancssorban!\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "A bemeneti sor (%u) t�l hossz�, vagy hi�nyzik a soremel�s.\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6487,52 +6557,61 @@ msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6540,113 +6619,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
@@ -6713,7 +6791,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
@@ -6737,139 +6815,139 @@ msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "rossz igazol�s"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kulcs tal�lhat�: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, 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:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Ez a kulcs lej�rt!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, 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:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7033,7 +7111,7 @@ msgstr "%c%lu preferencia k�tszer szerepel!\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nincs le�r�s.)\n"
@@ -7087,10 +7165,6 @@ msgstr "rossz igazol�s"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7247,29 +7321,39 @@ msgstr "Haszn�lat: gpg [opci�k] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, 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:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8072,18 +8156,6 @@ msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 #~ msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
diff --git a/po/id.po b/po/id.po
index 963fd53e9..4d5ffe3e3 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -34,36 +34,41 @@ msgid ""
 "this session"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase yang buruk"
@@ -73,21 +78,21 @@ msgstr "passphrase yang buruk"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -158,29 +163,50 @@ msgstr "passphrase tidak diulang dengan benar; coba lagi"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Tetap gunakan kunci ini? "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Masukkan passphrase\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "ubah passphrase"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -191,252 +217,252 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -464,40 +490,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Batal"
@@ -656,12 +682,12 @@ msgstr "masalah komunikasi dengan gpg-agent\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
@@ -727,77 +753,77 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "header armor tidak valid: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "header armor: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "header clearsig tidak valid\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "signature teks bersarang\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armor tidak terduga:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (tanpa CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (dalam CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (dalam Trailer)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -851,8 +877,8 @@ msgstr "kunci rahasia tidak tersedia"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@ -926,7 +952,7 @@ msgstr "tidak ada kunci publik yang sesuai: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -1038,7 +1064,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
@@ -1062,7 +1088,7 @@ msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
@@ -1071,7 +1097,7 @@ msgstr "berhenti dari menu ini"
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
@@ -1128,7 +1154,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Perintah> "
 
@@ -1147,27 +1173,27 @@ msgstr "perintah saling konflik\n"
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
@@ -1209,92 +1235,92 @@ msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "menggunakan cipher %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --"
 "pgp2\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "masalah menangani paket terenkripsi\n"
 
@@ -1387,42 +1413,42 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "PERINGATAN: kunci rahasia %08lX tidak memiliki sebuah checksum SK sederhana\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
@@ -1446,7 +1472,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
@@ -1461,7 +1487,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1469,128 +1495,132 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1601,47 +1631,47 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1649,7 +1679,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1669,15 +1699,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1687,7 +1717,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1695,561 +1725,561 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -2641,421 +2671,421 @@ msgstr "kunci rahasia tidak dapat dipakai"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            tidak diimpor: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
@@ -3164,12 +3194,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
@@ -3383,8 +3413,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -3393,20 +3423,20 @@ msgstr "gagal menandai: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
@@ -3423,11 +3453,11 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3435,206 +3465,206 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3642,241 +3672,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3884,19 +3914,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3904,7 +3934,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3914,55 +3944,75 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID \"%s\" dibatalkan."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "User ID \"%s\" dibatalkan."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "User ID \"%s\" dibatalkan."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID \"%s\" telah dibatalkan\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3972,202 +4022,202 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
 "dilakukan\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
@@ -4210,12 +4260,12 @@ msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
@@ -4517,7 +4567,7 @@ msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4525,12 +4575,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4543,7 +4593,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4555,50 +4605,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4608,45 +4658,45 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -4792,7 +4842,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
@@ -4827,312 +4877,312 @@ msgstr "mencari \"%s\" dari server HKP %s\n"
 msgid "searching for names from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -5166,56 +5216,66 @@ msgstr "%s signature, algoritma digest %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
@@ -5272,7 +5332,7 @@ msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
@@ -5300,12 +5360,12 @@ msgstr "Masukkan passphrase\n"
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5315,12 +5375,12 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5373,23 +5433,23 @@ msgstr "Apakah foto ini benar (y/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "tidak dapat menampilkan photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "Kunci dilampaui"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "Kunci ini telah dikompromikan"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "Kunci tidak lagi digunakan"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
@@ -5460,7 +5520,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Keputusan anda? "
 
@@ -5506,110 +5566,110 @@ msgstr ""
 "pertanyaan berikut dengan ya\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Tetap gunakan kunci ini? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "Peringatan: kunci ini mungkin dibatalkan:(kunci pembatalan tidak ada)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "        Hal ini dapat berarti bahwa signature adalah palsu.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Catatan: Kunci ini telah ditiadakan\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Catatan: Kunci ini telah berakhir!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5617,42 +5677,42 @@ msgstr ""
 "\n"
 "Masukkan user ID.  Akhiri dengan baris kosong: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
@@ -5661,27 +5721,32 @@ msgstr "kunci %08lX: tidak ada ID user\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Menghapus signature.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "tidak dapat membuka data tertandai `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5715,7 +5780,7 @@ msgid "NOTE: key has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet gagal: %s\n"
@@ -5738,11 +5803,11 @@ msgstr "(Ini adalah kunci pembatalan sensitif)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "Pemaksaan output mode ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "gagal make_keysig_packet: %s\n"
@@ -5756,34 +5821,34 @@ msgstr "Sertifikat pembatalan tercipta.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "CATATAN: Kunci ini tidak diproteksi!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5803,34 +5868,34 @@ msgstr ""
 "pencetakan\n"
 "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Batal"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Mungkin anda ingin memilih %d di sini)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Alasan pembatalan: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ini oke? "
@@ -6004,29 +6069,29 @@ msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -6412,7 +6477,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6422,11 +6487,16 @@ msgstr ""
 "Tolong ingat bahwa file signature (.sig atau .asc)\n"
 "haruslah file pertama yang diberikan pada perintah baris.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "tidak dapat membuka `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6490,52 +6560,61 @@ msgstr "gagal membuat kembali cache keyring: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6543,113 +6622,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -6716,7 +6794,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
@@ -6740,139 +6818,139 @@ msgstr "protokol gpg-agent versi %d tidak didukung\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kunci tersedia di:"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "buat sertifikat revokasi"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "tampilkan fingerprint"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikasi signature"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7035,7 +7113,7 @@ msgstr "preferensi %c%lu ganda \n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
@@ -7089,10 +7167,6 @@ msgstr "sertifikat yang buruk"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7249,29 +7323,39 @@ msgstr "pemakaian: gpg [pilihan] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Silakan pilih kunci yang anda inginkan:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8074,18 +8158,6 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 #~ msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "User ID \"%s\" dibatalkan."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "User ID \"%s\" dibatalkan."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "User ID \"%s\" dibatalkan."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "User ID \"%s\" telah dibatalkan\n"
 
diff --git a/po/it.po b/po/it.po
index e90911bc8..6b4a5932d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -32,36 +32,41 @@ msgid ""
 "this session"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "riga troppo lunga\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase troppo lunga\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Carattere non valido nel nome\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI danneggiato"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase errata"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase errata"
@@ -71,21 +76,21 @@ msgstr "passphrase errata"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -156,29 +161,50 @@ msgstr "passphrase non ripetuta correttamente; prova ancora"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Uso lo stesso questa chiave? "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Inserisci la passphrase\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -189,252 +215,252 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: saltata: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -462,40 +488,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase errata"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancella"
@@ -654,12 +680,12 @@ msgstr "problema di comunicazione con gpg-agent\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
@@ -725,77 +751,77 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "firme in chiaro annidate\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armatura inaspettata:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -849,8 +875,8 @@ msgstr "la chiave segreta non � disponibile"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
@@ -925,7 +951,7 @@ msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -1037,7 +1063,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
@@ -1061,7 +1087,7 @@ msgstr "Parti della chiave segreta non sono disponibili.\n"
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
@@ -1070,7 +1096,7 @@ msgstr "abbandona questo men�"
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
@@ -1127,7 +1153,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Comando> "
 
@@ -1146,27 +1172,27 @@ msgstr "comandi in conflitto\n"
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
@@ -1208,50 +1234,50 @@ msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "impossibile usare un pacchetto ESK simmetrico a causa della modalit� S2K\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "uso il cifrario %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "in modalit� --pgp2 puoi cifrare solo per chiavi RSA non pi� lunghe di 2048 "
 "bit\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "impossibile usare il cifrario IDEA con tutti i tipi di chiavi per cui\n"
 "stai cifrando.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1259,7 +1285,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1268,41 +1294,41 @@ msgstr ""
 "forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "problema nella gestione del pacchetto cifrato\n"
 
@@ -1396,41 +1422,41 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
@@ -1454,7 +1480,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1470,7 +1496,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1478,128 +1504,132 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1610,47 +1640,47 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1658,7 +1688,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1678,15 +1708,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1696,7 +1726,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1704,558 +1734,558 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
 "permessi insicuri.\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 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:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -2648,424 +2678,424 @@ msgstr "chiave segreta inutilizzabile"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             importate: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
 "revoca %08lX non � presente.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
@@ -3174,12 +3204,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
@@ -3391,8 +3421,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -3401,20 +3431,20 @@ msgstr "firma fallita: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
@@ -3431,11 +3461,11 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3443,206 +3473,206 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3650,241 +3680,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe della firma sconosciuta"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non � permesso in modalit� %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3893,19 +3923,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3914,7 +3944,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3923,56 +3953,76 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "L'user ID \"%s\" � stato revocato."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "L'user ID \"%s\" � stato revocato."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "L'user ID \"%s\" � stato revocato."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3982,207 +4032,207 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di s� stessa\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ATTENZIONE: la nomina di una chiave a revocatrice designata non pu� essere\n"
 "annullata.\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
 "incrociata\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4226,12 +4276,12 @@ msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
@@ -4535,7 +4585,7 @@ msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4543,12 +4593,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4560,7 +4610,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4572,50 +4622,50 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4625,12 +4675,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4638,7 +4688,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4646,26 +4696,26 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -4813,7 +4863,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
@@ -4848,12 +4898,12 @@ msgstr "cerco \"%s\" sul server HKP %s\n"
 msgid "searching for names from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4861,299 +4911,299 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ATTENZIONE: trovate firme multiple. Sar� controllata solo la prima.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -5188,56 +5238,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrami ulteriori informazioni\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Non compresso"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
@@ -5298,7 +5358,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
@@ -5326,12 +5386,12 @@ msgstr "Inserisci la passphrase\n"
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5341,12 +5401,12 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5400,23 +5460,23 @@ msgstr "Questa foto � giusta? (s/N/q) "
 msgid "unable to display photo ID!\n"
 msgstr "impossibile mostrare l'ID fotografico\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Nessuna ragione specificata"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "Questa chiave � stata sostituita"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "Questa chiave � stata compromessa"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "La chiave non � pi� usata"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "L'user ID non � pi� valido"
 
@@ -5487,7 +5547,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
@@ -5533,112 +5593,112 @@ msgstr ""
 "rispondere s� alla prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Uso lo stesso questa chiave? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ATTENZIONE: questa chiave pu� essere stata revocata (la chiave di revoca\n"
 "non � presente).\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: questa chiave � stata disabilitata.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltata: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5646,42 +5706,42 @@ msgstr ""
 "\n"
 "Inserisci l'user ID. Termina con una riga vuota: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "saltata: chiave pubblica gi� impostata\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltata: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chiave %08lX: nessun user ID\n"
@@ -5691,27 +5751,32 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "impossibile aprire i dati firmati `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5746,7 +5811,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet fallito: %s\n"
@@ -5769,11 +5834,11 @@ msgstr "(Questa � una chiave di revoca sensibile)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "Forzato l'output con armatura ASCII.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fallito: %s\n"
@@ -5787,34 +5852,34 @@ msgstr "Certificato di revoca creato.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "non sono state trovate chiavi di revoca per `%s'\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chiave segreta `%s' non trovata: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Questa chiave non � protetta!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5834,33 +5899,33 @@ msgstr ""
 "disponibili\n"
 "ad altri!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Cancella"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabilmente volevi scegliere %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo della revoca: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Va bene cos�? "
@@ -6051,29 +6116,29 @@ msgstr "controllo della firma creata fallito: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
 "2.x\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
@@ -6460,7 +6525,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6470,11 +6535,16 @@ msgstr ""
 "Ricorda che il file con la firma (.sig or .asc) deve\n"
 "essere il primo file indicato sulla riga di comando.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "impossibile aprire `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6538,52 +6608,61 @@ msgstr "rebuild della cache del portachiavi fallito: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6591,113 +6670,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera una nuova coppia di chiavi"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@ -6764,7 +6842,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
@@ -6788,139 +6866,139 @@ 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:159
+#: sm/certchain.c:165
 #, 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:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificato danneggiato"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chiave disponibile presso: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genera un certificato di revoca"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Questa chiave � scaduta!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra le impronte digitali"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una firma"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7083,7 +7161,7 @@ msgstr "la preferenza %c%lu � doppia\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Non � stata data una descrizione)\n"
@@ -7137,10 +7215,6 @@ msgstr "certificato danneggiato"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7297,29 +7371,39 @@ msgstr "uso: gpg [opzioni] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent non � disponibile in questa sessione\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Per favore scegli che tipo di chiave vuoi:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8125,18 +8209,6 @@ msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 #~ msgstr "impossibile eseguire %s \"%s\": %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "L'user ID \"%s\" � stato revocato."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "L'user ID \"%s\" � stato revocato."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "L'user ID \"%s\" � stato revocato."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
diff --git a/po/ja.po b/po/ja.po
index d8f3c63f1..775091ff9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -35,36 +35,41 @@ msgid ""
 "this session"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "������MPI�Ǥ�"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
@@ -74,21 +79,21 @@ msgstr "�ѥ��ե졼���������Ǥ�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -159,29 +164,50 @@ msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "PIN [��̾��: %lu]"
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "�ѥ��ե졼��������\n"
+
+#: agent/genkey.c:146
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -192,252 +218,252 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -465,40 +491,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "����󥻥�"
@@ -657,12 +683,12 @@ msgstr "gpg-agent�Ȥ��̿��㳲\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
@@ -727,75 +753,75 @@ msgstr "oO"
 msgid "cC"
 msgstr "cC"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "����: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "̵���������إå���: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "�����إå���: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "̵���ʥ��ꥢ��̾�إå���\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "����ҤΥ��ꥢ��̾\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 msgid "unexpected armor: "
 msgstr "ͽ����������: "
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC���顼��%06lX - %06lX\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -848,8 +874,8 @@ msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
@@ -917,7 +943,7 @@ msgstr "��������õ������URL: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -1022,7 +1048,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
@@ -1042,7 +1068,7 @@ msgstr "������̩��ʬ��̵���Ǥ�\n"
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
@@ -1050,7 +1076,7 @@ msgstr "���Υ�˥塼��λ"
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
@@ -1102,7 +1128,7 @@ msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "���ޥ��> "
 
@@ -1118,27 +1144,27 @@ msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "���֥��å����ɽФ����顼: %s\n"
@@ -1177,88 +1203,88 @@ msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K�⡼�ɤΤ��ᡢ�о�ESK�ѥ��åȤ�Ȥ��ޤ���\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: ��%s�פ϶��Υե�����Ǥ�\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�2048�ӥåȰʲ���RSA���ǰŹ沽�����Ǥ��ޤ���\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "��%s�פ����ɤ߽Ф��ޤ�\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "�ٹ�: ���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s�Ź沽 ������:��%s��\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ���\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "�Ź沽�ѥ��åȤμ谷���Ǿ㳲\n"
 
@@ -1348,40 +1374,40 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 msgid "exporting secret keys not allowed\n"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "��%s: �ݸ��Ƥ��ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "��%s: PGP 2.x�����θ��Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
@@ -1404,7 +1430,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
@@ -1419,7 +1445,7 @@ msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1427,127 +1453,131 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "�����"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1558,51 +1588,51 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1611,7 +1641,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1631,15 +1661,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1649,7 +1679,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1657,542 +1687,542 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2933
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2939
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2952
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3175
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3141
+#: g10/gpg.c:3180
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -2577,417 +2607,417 @@ msgstr "���ѤǤ��ʤ���̩���Ǥ�"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��%d�Υ֥��å���ȤФ��ޤ�\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "    ��������: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "�ȤФ�����������: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "          �ɹ���: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "�������桼����ID: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      ����������: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "      ��������̾: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  �����������: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        ̤�ɹ���: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": �Ź楢�르�ꥺ������� %s\n"
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": ���󥢥르�ꥺ������� %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": ���̥��르�ꥺ������� %s\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "��%s: �桼����ID������ޤ���\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "��%s: PKS��������¤����\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "��%s:��%s�ɿ�������̾��1��\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "��%s:��%s�ɿ�����������1��\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "��%s:��%s�ɿ�����������%d��\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "��%s:��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "��%s: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "��%s: �����б���������������ޤ���\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "��%s: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "��%s: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "��%s: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "��%s: ̵�������������Ǥ�\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "��%s: �ȤФ����桼����ID��%s��\n"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "��%s: �ȤФ�������\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
@@ -3096,12 +3126,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
@@ -3285,8 +3315,8 @@ msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
@@ -3295,20 +3325,20 @@ msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
@@ -3325,11 +3355,11 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3338,206 +3368,206 @@ msgstr ""
 "�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "��̾�μ���"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "������"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "���������ɲ�"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "��������������URI������"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ɥ��ޥ�ɤ�ȤäƤ���������\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3545,159 +3575,159 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr "���μ縰�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "���򤷤����������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���θ��������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "���򤷤����������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
 "����\n"
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr "�������������:\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3705,71 +3735,71 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3777,17 +3807,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3795,7 +3825,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3804,55 +3834,75 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3861,191 +3911,191 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "��̾����: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -4085,12 +4135,12 @@ msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
@@ -4390,7 +4440,7 @@ msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4398,12 +4448,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4415,7 +4465,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4426,50 +4476,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4478,42 +4528,42 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
@@ -4658,7 +4708,7 @@ msgstr "disabled"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
@@ -4692,306 +4742,306 @@ msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 msgid "searching for names from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��%s��%s������%s������\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��%s��%s������\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 msgid "no keyserver action!\n"
 msgstr "�������С�����������󤬤���ޤ���!\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 msgid "keyserver timed out\n"
 msgstr "�������С��Υ����ॢ����\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 msgid "keyserver internal error\n"
 msgstr "�������С����������顼\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "�������С��̿����顼: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s �Ź沽�Ѥߥ��å����\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "̤�Τ����󥢥르�ꥺ����������줿�ѥ��ե졼�� %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, c-format
 msgid "public key is %s\n"
 msgstr "��������%s�Ǥ�\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ˤ��Ź沽�Ѥߥǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %s, ����%s�˰Ź沽����ޤ���\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ��%s��\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s��, ID %s�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ�������\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź�ˡ��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s��%s�����\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "��%s�ɤ���� ������ ��̾"
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -5025,55 +5075,65 @@ msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "̵����"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
@@ -5129,7 +5189,7 @@ msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %s)"
@@ -5157,12 +5217,12 @@ msgstr "�ѥ��ե졼��������\n"
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5171,12 +5231,12 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�:��%s��\n"
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (�縰ID %s ������)"
@@ -5226,23 +5286,23 @@ msgstr "���μ̿����������Ǥ��� (y/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "�ե���ID��ɽ����ǽ!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "��ͳ�ϻ��ꤵ��Ƥ��ޤ���"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "�����Ȥ꤫��äƤ��ޤ�"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "�����ѥ����ޤ���"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "���Ϥ⤦���ѤǤ�"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
 
@@ -5307,7 +5367,7 @@ msgid ""
 "\n"
 msgstr "���θ��κǾ����ѥ�٥�: %s\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "���ʤ��η����? "
 
@@ -5347,105 +5407,105 @@ msgstr ""
 "�ޤ��󡣺�����Ԥ����Ȥ�������ˡ����򤷤Ƥ��ʤ����ˤϡ�\n"
 "���μ���ˤ�no�������Ƥ���������\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�ٹ�: ���ѤǤ��ʤ�����ȤäƤ��ޤ�!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "�ٹ�: ���θ��ϼ������줿�褦�Ǥ� (���������Ժ�)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "�ٹ�: ���θ��ϻ�̾�����Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      ��̾����ʪ�ʤ��Ȥ⤢�롢�Ȥ������ȤǤ���\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "�ٹ�: ���������Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "����: ���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ���\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "����: ���θ�����λ�Ǥ�!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ��� ����!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      ���ν�̾�Ϥ����餯 ��ʪ �Ǥ���\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������Ϥ⤦����ޤ�\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�ɤ�Ȥ��ޤ��礦) ��\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr "������:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5453,42 +5513,42 @@ msgstr ""
 "\n"
 "�桼����ID�����ϡ����Ԥǽ�λ: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "�������ϻ��ѶػߤǤ���\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "�����å�: �������Ϥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "����μ���͡�%s�ɤ����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "ͭ���ʰ��褬����ޤ���\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "��%s�ˤϥ桼����ID������ޤ���\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "��%s�ˤϥ桼����ID������ޤ���\n"
@@ -5499,27 +5559,32 @@ msgstr ""
 "�ǡ�������¸����Ƥ��ޤ���\n"
 "��¸����ˤϡ�--output�ɥ��ץ�����ȤäƤ�������\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "ʬΥ��̾��\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɽФ��� ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5553,7 +5618,7 @@ msgid "NOTE: key has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
@@ -5575,11 +5640,11 @@ msgstr "(����ϡ��ǥꥱ���Ȥʼ������Ǥ�)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ��������̾�����������������ޤ���? (y/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII�������Ϥ������ޤ���\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �˼��Ԥ��ޤ���: %s\n"
@@ -5593,33 +5658,33 @@ msgstr "����������������\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "��%s���Ѥμ����������Ĥ���ޤ���\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "��̩����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�б����������������ޤ���: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "����: ���θ����ݸ��Ƥ��ޤ���!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5637,33 +5702,33 @@ msgstr ""
 "�������Ǥ����������������դ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
 "����Ǥ⸫������˥ǡ����򤪤����Ȥ�����ޤ�!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "��������ͳ�����򤷤Ƥ�������:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(�����ǤϤ��֤�%d�����Ӥޤ�)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "ͽ�������������ϡ����Ԥǽ�λ:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "������ͳ: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr "��������Ǥ���? (y/N) "
 
@@ -5821,25 +5886,25 @@ msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
@@ -6223,7 +6288,7 @@ msgstr ""
 "���ѥǡ����١����ΥС�����󡦥쥳���ɤ������Ǥ��ޤ���: ����ߤ˼��Ԥ��ޤ�"
 "��: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6233,11 +6298,16 @@ msgstr ""
 "(.sig��.asc)�����ޥ�ɹԤκǽ�Ǥʤ����\n"
 "�ʤ�ʤ����Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "��%s�פ������ޤ���: %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6301,52 +6371,61 @@ msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "PIN [��̾��: %lu]"
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, fuzzy, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "PIN [��̾��: %lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
@@ -6354,110 +6433,109 @@ msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|������Admin PIN"
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "������PIN"
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 msgid "error reading fingerprint DO\n"
 msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 msgid "key already exists\n"
 msgstr "���Ϥ⤦����ޤ�\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 msgid "generating new key\n"
 msgstr "��������������\n"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 msgid "generating key failed\n"
 msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: scd/app-openpgp.c:2235
-#, fuzzy, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "PIN [��̾��: %lu]"
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
@@ -6521,7 +6599,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
@@ -6545,139 +6623,139 @@ msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "���������������"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA���: "
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "��̾�򸡾�"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6840,7 +6918,7 @@ msgstr "������%s�פν�ʣ\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
@@ -6895,10 +6973,6 @@ msgstr "�����ʾ�����Ǥ�"
 msgid "register a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7063,29 +7137,39 @@ msgstr "�Ȥ���: gpg [���ץ����] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "�������븰�η������򤷤Ƥ�������:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -7898,18 +7982,6 @@ msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 #~ msgstr "��%s�פ�¹ԤǤ��ޤ���: %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
diff --git a/po/nb.po b/po/nb.po
index 4e8a65341..51a18164d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <[email protected]>\n"
 "Language-Team: Norwegian Bokm�l <[email protected]>\n"
@@ -35,36 +35,41 @@ msgid ""
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i navn\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "ugyldig MPI"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "ugyldig passfrase"
@@ -74,21 +79,21 @@ msgstr "ugyldig passfrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -159,29 +164,50 @@ msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Bruke denne n�kkelen likevel? (j/N) "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Tast inn passfrase\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "endre passfrasen"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -192,251 +218,251 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "fyldig output"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, 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:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -464,37 +490,37 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "ugyldig passfrase"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancel|cancel"
@@ -652,11 +678,11 @@ msgstr ""
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -720,75 +746,75 @@ msgstr "oO"
 msgid "cC"
 msgstr "cC"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "ugyldig armorheader: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "armorheader: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "ugyldig clearsigheader\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "n�stede klartekstsignaturer\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 msgid "unexpected armor: "
 msgstr "uforventet armering:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "ugyldig bindestrekbeskyttet linje: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "misdannet CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-feil; %06lX - %06lX\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "feil i trailerlinje\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP-data funnet.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldig armor: linje lengre enn %d tegn\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -839,8 +865,8 @@ 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:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke gj�re dette i batchmodus\n"
 
@@ -908,7 +934,7 @@ msgstr "URL for � hente offentlig n�kkel: "
 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:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -1013,7 +1039,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsn�kkel\n"
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
@@ -1033,7 +1059,7 @@ msgstr "hemmelige deler av n�kkelen er ikke tilgjengelig.\n"
 msgid "secret key already stored on a card\n"
 msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "avslutte denne menyen"
 
@@ -1041,7 +1067,7 @@ msgstr "avslutte denne menyen"
 msgid "show admin commands"
 msgstr "vise admin-kommandoer"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "vise denne hjelpen"
 
@@ -1093,7 +1119,7 @@ msgstr "meny for � endre eller fjerne blokkering av PIN"
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Kommando> "
 
@@ -1109,27 +1135,27 @@ msgstr "Admin-kommandoer er tillatt\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "feil ved lesing av n�kkelblokk: %s\n"
@@ -1168,48 +1194,48 @@ msgstr "det finnes en hemmelig n�kkel for offentlig n�kkel �%s�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "bruk valget �--delete-secret-keys� for � slette den f�rst.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan ikke bruke en symmetrisk ESK-pakke p� grunn av S2K-modusen\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "bruker cipher %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "�%s� er allerede komprimert\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: �%s� er en tom fil\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "du kan bare kryptere med RSA-n�kler med lengder p� 2048 bits eller mindre i "
 "--pgp2-modus\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leser fra �%s�\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "klarte ikke � bruke IDEA-algoritmen for alle n�klene du krypterer til.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1217,7 +1243,7 @@ msgstr ""
 "ADVARSEL: p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1226,40 +1252,40 @@ msgstr ""
 "ADVARSEL: tvang av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan ikke bruke %s i %s modus\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kryptert for: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterte data\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ADVARSEL: meldingen er kryptert med en svak n�kkel for den symmetriske "
 "cipher.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "problem ved h�ndtering av kryptert pakke\n"
 
@@ -1345,40 +1371,40 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 msgid "exporting secret keys not allowed\n"
 msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�kkel %s: ikke beskyttet - hoppet over\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�kkel %s: PGP 2.x-aktig n�kkel - hoppet over\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "n�kkel %s: n�kkelmateriell p� kort - hoppet over\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "klarte ikke � fjerne beskyttelsen p� undern�kkelen: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ADVARSEL: hemmelig n�kkel %s har ikke en enkel SK-sjekksum\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: ingenting eksportert\n"
 
@@ -1401,7 +1427,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
@@ -1416,7 +1442,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1424,127 +1450,131 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "liste n�kler"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "liste n�kler og signaturer"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "generere et nytt n�kkelpar"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "signere en n�kkel"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "signere en n�kkel lokalt"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "signere eller redigere en n�kkel"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "generere et opphevingssertifikat"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "oppdatere alle n�klene fra en n�kkelserver"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importere/flette n�kler"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "vis kortets status"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "endre data p� et kort"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "endre PIN p� et kort"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "oppdatere tillitsdatabasen"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1555,47 +1585,47 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "bruk som outputfil"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "sp�r f�r overskriving"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppf�rsel"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr "generere PGP 2.x-kompatible meldinger"
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1603,7 +1633,7 @@ msgstr ""
 "@\n"
 "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1623,15 +1653,15 @@ msgstr ""
 " --list-keys [navn]         vise n�kler\n"
 " --fingerprint [navn]       vise fingeravtrykk\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1641,7 +1671,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1649,73 +1679,73 @@ msgstr ""
 "\n"
 "St�ttede algoritmer:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen �%"
 "s�\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1723,20 +1753,20 @@ msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
 "�%s�\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
 "�%s�\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1744,452 +1774,452 @@ msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
 "konfigurasjonsfilen �%s�\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "cipherutvidelse �%s� ble ikke lastet p� grunn av utrygge rettigheter\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -2505,416 +2535,416 @@ msgstr ""
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hopper over blokk av typen %d\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�kler behandlet hittil\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antall behandlet: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "nye n�kler som ble hoppet over: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "               uten brukerider: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                     importert: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                       uendret: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                nye brukerider: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               nye undern�kler: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                nye signaturer: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         nye n�kkelopphevinger: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "        leste hemmelige n�kler: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "   importerte hemmelige n�kler: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  uforandrede hemmelige n�kler: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                ikke importert: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         oppryddete signaturer: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "         oppryddete brukerider: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         �%s� preferanse for digestalgoritme %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�kkel %s: ingen brukerid\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�kkel %s: PKS-undern�kkel reparert\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�kkel %s: akseptert ikke-selvsignert brukerid �%s�\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�kkel %s: ingen gyldig brukerid\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dette kan skyldes en manglende selvsignatur\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�kkel %s: offentlig n�kkel ikke funnet: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til �%s�\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�kkel %s: offentlig n�kkel �%s� importert\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�kkel %s: stemmer ikke med v�r kopi\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�kkel %s: kan ikke finne original n�kkelblokk: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�kkel %s: kan ikke lese original n�kkelblokk: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�kkel %s: �%s� 1 ny brukerid\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�kkel %s: �%s� 1 ny signatur\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�kkel %s: �%s� 1 ny undern�kkel\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�kkel %s: �%s� %d nye undern�kler\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�kkel %s: �%s� ikke endret\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel med ugyldig cipher %d - hoppet over\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemmelig n�kkel er ikke tillatt\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard hemmelig n�kkelknippe: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "n�kkel %s: hemmelig n�kkel importert\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "n�kkel %s: finnes allerede i hemmelig n�kkelknippe\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "n�kkel %s: hemmelig n�kkel ikke funnet: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "n�kkel %s: ingen offentlig n�kkel - kan ikke anvende opphevingssertifikat\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�kkel %s: ingen brukerid for signatur\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme for brukerid �%s�\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�kkel %s: ugyldig selvsignatur for brukerid �%s�\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "n�kkel %s: ingen undern�kkel for n�kkelbinding\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�kkel %s: fjernet flere undern�kkelbindinger\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�kkel %s: ingen undern�kkel for n�kkeloppheving\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�kkel %s: ugyldig undern�kkeloppheving\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�kkel %s: fjernet flere undern�kkelopphevinger\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "n�kkel %s: hoppet over brukerid �%s�\n"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "n�kkel %s: hoppet over undern�kkel\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�kkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�kkel %s: opphevingssertifikat p� feil plass - hoppet over\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�kkel %s: undern�kkelsignatur p� feil plass - hoppet over\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�kkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "n�kkel %s: duplikert brukerid oppdaget - flettet sammen\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: n�kkel %s kan v�re opphevet: henter opphevingsn�kkel %s\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ADVARSEL: n�kkel %s kan v�re opphevet: opphevingsn�kkel %s ikke tilstede.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
@@ -3020,12 +3050,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Brukerid �%s� er opphevet."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du fortsatt sikker p� at du vil signerere den? (j/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Kunne ikke signere.\n"
 
@@ -3209,8 +3239,8 @@ msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
 msgid "Really sign? (y/N) "
 msgstr "Virkelig signere? (j/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
@@ -3219,19 +3249,19 @@ msgstr "signering mislyktes: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Denne n�kkelen er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er lagret p� kort.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "N�kkelen er beskyttet.\n"
 
@@ -3246,194 +3276,194 @@ msgid ""
 "\n"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "Du �nsker ikke en passfrase - dette er sannsynligvis en *dum* id�!\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gj�re dette? (j/N) "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "flytter en n�kkelsignatur til den rette plassen\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "lagre og avslutte"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 msgid "show key fingerprint"
 msgstr "vise n�kkelens fingeravtrykk"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "liste n�kler og brukerider"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 msgid "select subkey N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 msgid "check signatures"
 msgstr "sjekke signaturer"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs locally"
 msgstr "signerere utvalgte brukerider lokalt"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr "signere utvalgte brukerider med en tillitssignatur"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "legge til en brukerid"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "legge til en fotoid"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 msgid "delete selected user IDs"
 msgstr "slette utvalgte brukerider"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 msgid "add a subkey"
 msgstr "legge til en undern�kkel"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 msgid "delete selected subkeys"
 msgstr "slette utvalgte undern�kler"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "legge til en opphevingsn�kkel"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 msgid "delete signatures from the selected user IDs"
 msgstr "slette signaturene fra de utvalgte brukeridene"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr "markere den valgte brukeriden som den prim�re"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 msgid "toggle between the secret and public key listings"
 msgstr "veksle mellom hemmelig og offentlig n�kkellisting"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "liste preferanser (ekspert)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "liste preferanser (fyldig)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 msgid "set preference list for the selected user IDs"
 msgstr "sette preferanseliste for de valgte brukeridene"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "sette URL for foretrukket n�kkelserver for de valgte brukeridene"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 msgid "set a notation for the selected user IDs"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "endre passfrasen"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "endre eiertilliten"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke signatures on the selected user IDs"
 msgstr "oppheve signaturene p� de valgte brukeridene"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "revoke selected user IDs"
 msgstr "oppheve utvalgte brukerider"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr "oppheve n�kkel eller utvalgte undern�kler"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 msgid "enable key"
 msgstr "innkoble en n�kkel"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 msgid "disable key"
 msgstr "utkoble en n�kkel"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr "vise utvalgte fotoider"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "feil ved lesing av hemmelig n�kkelblokk �%s�: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Hemmelig n�kkel er tilgjengelig\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Vennligst bruk kommandoen �toggle� f�rst.\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3441,487 +3471,507 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "N�kkelen er opphevet."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Virkelig signerere alle brukerider? (j/N) "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Velg brukeriden som skal signeres\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Ukjent signaturtype �%s�\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Du m� velge minst en brukerid.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan ikke slette den siste brukeriden!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Virkelig fjerne alle valgte brukerider? (j/N) "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr "Virkelig fjerne denne brukeriden? (j/N) "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr "Virkelig flytte prim�rn�kkelen? (j/N) "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan ikke �pne �%s�: %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Feil ved lesing av sikkerhetskopiert n�kkel �%s�: %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig slette denne n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Virkelig oppheve alle de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Virkelig oppheve denne brukeriden? (j/N) "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig oppheve hele n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du virkelig oppheve de valgte undern�klene? (j/N) "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig oppheve denne undern�kkelen? (j/N) "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr "sette preferanseliste til:\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Virkelig oppdatere preferansene for de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr "Virkelig oppdatere preferansene? (j/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 msgid "Save changes? (y/N) "
 msgstr "Lagre endringene? (j/N) "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 msgid "Quit without saving? (y/N) "
 msgstr "Avslutte uten � lagre? (j/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "N�kkelen ble ikke endret, s� ingen oppdatering er n�dvendig.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "S�rtrekk: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Det er ingen preferanser for en PGP 2.x-aktig brukerid.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Denne n�kkelen ble opphevet den %s av %s med n�kkelen %s\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne n�kkelen kan bli opphevet av %s med n�kkelen %s"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, c-format
 msgid "expires: %s"
 msgstr "utg�r: %s"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "bruksm�te: %s"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Denne n�kkelen har blitt utkoblet"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "utg�tt"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at du vil legge den til? (j/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettet %d signatur.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "ugyldig"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "brukerid �%s�: allerede renset\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+
 #: g10/keyedit.c:3252
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "brukerid �%s�: allerede renset\n"
+
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
 "N) "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Vennligst velg minst en undern�kkel.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at du vil slette den? (j/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk den %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (ikke-opphevbar)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "ingen hemmelig n�kkel\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "brukerid �%s� er allerede opphevet\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�kkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3961,12 +4011,12 @@ msgid "writing key binding signature\n"
 msgstr "skriver n�kkelbindende signatur\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
@@ -4269,7 +4319,7 @@ msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
 msgid "Please correct the error first\n"
 msgstr "Vennligst korriger feilen f�rst\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4277,12 +4327,12 @@ msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4294,7 +4344,7 @@ msgstr ""
 "hjelp av dette programmet og valget �--edit-key�.\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4306,50 +4356,50 @@ msgstr ""
 "diskene jobbe) under primtallgenereringen; dette gir\n"
 "tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "N�kkelgenereringen ble avbrutt.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentlig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver forel�pig hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4358,13 +4408,13 @@ msgstr ""
 "kanskje � bruke kommandoen �--edit-key� for � generere en\n"
 "sekund�rn�kkel for dette form�let.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
 # Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4373,7 +4423,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4381,27 +4431,27 @@ msgstr ""
 "n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MERK: opprettelse av undern�kler for v3-n�kler er ikke i samsvar med "
 "OpenPGP\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr "Virkelig opprette? (j/N)"
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4545,7 +4595,7 @@ msgstr "utkoblet"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
@@ -4579,306 +4629,306 @@ msgstr "s�ke etter navn fra %s server %s\n"
 msgid "searching for names from %s\n"
 msgstr "s�ker etter navn fra %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s�ke etter �%s� fra %s server %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s�ker etter �%s� fra %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 msgid "no keyserver action!\n"
 msgstr "ingen handling for n�kkelserver!\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr "n�kkelserver sendte ikke VERSION\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 msgid "keyserver timed out\n"
 msgstr "n�kkelserver svarte ikke tidsnok\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 msgid "keyserver internal error\n"
 msgstr "intern feil ved n�kkelserver\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikasjonsfeil med n�kkelserver: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � oppfriske n�kkel %s via %s: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "oppfrisker 1 n�kkel fra %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "oppfrisker %d n�kler fra %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ADVARSEL: klarte ikke � parse URI %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "merkelig st�rrelse for en kryptert sesjonsn�kkel (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passfrase er generert med en ukjent digest-algoritme %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig n�kkel er %s\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig n�kkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kryptert med %u-bit %s-n�kkel, ID %s, opprettet %s\n"
 
 # Do we really need to translate this string.
 # The must some bug in the code.
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      �%s�\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-n�kkel, ID %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig n�kkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=�%.*s�\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 msgid "no signature found\n"
 msgstr "ingen signatur ble funnet\n"
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruker %s n�kkel %s\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur laget %s ved hjelp av %s-n�kkel ID %s\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "N�kkel tilgjengelig ved: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra �%s�"
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utg�tt signatur fra �%s�"
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra �%s�"
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka �%s�"
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utg�tt %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utg�r %s\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "bin�r"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4912,55 +4962,65 @@ msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "vennligst se %s for mer informasjon\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg �%s�\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
@@ -5016,7 +5076,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�kkelid %s)"
@@ -5044,12 +5104,12 @@ msgstr "Tast inn passfrase\n"
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5058,12 +5118,12 @@ msgstr ""
 "Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for\n"
 "brukeren: �%s�\n"
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s-n�kkel, ID %s, opprettet %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5108,23 +5168,23 @@ msgstr ""
 msgid "unable to display photo ID!\n"
 msgstr ""
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Ingen grunn er angitt"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "N�kkelen er overg�tt"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "N�kkelen har blitt kompromittert"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "N�kkelen er ikke lengre i bruk"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "Brukerid er ikke lengre gyldig"
 
@@ -5190,7 +5250,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Valget ditt? "
 
@@ -5234,110 +5294,110 @@ msgstr ""
 "brukeriden.  Dersom du *virkelig* vet hva du gj�r, kan du besvare det\n"
 "neste sp�rsm�let med ja.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "Bruke denne n�kkelen likevel? (j/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruker ubetrodd n�kkel!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "ADVARSEL: n�kkel %s kan v�re opphevet: opphevingsn�kkel %s ikke tilstede.\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen har blitt opphevet av den utpekte oppheveren!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�kkelen har blitt opphevet av dens eier!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dette kan bety at signaturen er falsk.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undern�kkelen har blitt opphevet av eieren!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Merk: Denne n�kkelen har blitt utkoblet.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Merk: Denne n�kkelen er utg�tt!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen er ikke sertifisert med en betrodd signatur!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Det er ingen indikasjon p� at signaturen tilh�rer eieren.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi stoler IKKE p� denne n�kkelen!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er sannsynligvis et FALSKNERI.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ADVARSEL: Denne n�kkelen er ikke sertifisert med tilstrekkelige betrodde "
 "signaturer!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer brukeren.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppet over: offentlig n�kkel er allerede tilstede\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du oppga ikke en brukerid. (Du kan bruke �-r�)\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5345,42 +5405,42 @@ msgstr ""
 "\n"
 "Tast inn brukeriden.  Avslutt med en blank linje: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Det finnes ingen slik brukerid.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�kkel er utkoblet.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "hoppet over: offentlig n�kkel er allerede satt\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "ukjent standardmottaker �%s�\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppet over: offentlig n�kkel er utkoblet\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adressater\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "n�kkel %s: ingen brukerid\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "n�kkel %s: ingen brukerid\n"
@@ -5389,27 +5449,32 @@ msgstr "n�kkel %s: ingen brukerid\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "kan ikke �pne �%s�: %s\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5444,7 +5509,7 @@ msgid "NOTE: key has been revoked"
 msgstr ""
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr ""
@@ -5466,11 +5531,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Lage et utpekt opphevingssertifikat for denne n�kkelen? (j/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr ""
@@ -5484,33 +5549,33 @@ msgstr ""
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr ""
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Lage et opphevingssertifikat for denne n�kkelen? (j/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr ""
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr ""
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5521,33 +5586,33 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr ""
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr "Er dette i orden? (j/N) "
 
@@ -5713,11 +5778,11 @@ msgstr ""
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-signatur fra: �%s�\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5725,15 +5790,15 @@ msgstr ""
 "ADVARSEL: p�tvinging av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -6105,18 +6170,23 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "kan ikke �pne �%s�: %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6180,52 +6250,61 @@ msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr "respons inneholder ikke data om offentlig n�kkel\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr "respons inneholder ikke RSA-modulus\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr "feil ved henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent l�st!\n"
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
@@ -6233,108 +6312,107 @@ msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr "feil ved lesing av applikasjonsdata\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 msgid "error reading fingerprint DO\n"
 msgstr "feil ved lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 msgid "key already exists\n"
 msgstr "n�kkel finnes allerede\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr "eksisterende n�kkel vil bli erstattet\n"
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 msgid "generating new key\n"
 msgstr "generere en ny n�kkel\n"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA-modulus mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtall %s mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr "vennligst vent mens n�kkel blir generert ...\n"
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 msgid "generating key failed\n"
 msgstr "n�kkelgenerering mislyktes\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet st�tter ikke digestalgoritme %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet s� langt: %lu\n"
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
@@ -6398,7 +6476,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
@@ -6421,138 +6499,138 @@ msgstr ""
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:159
+#: sm/certchain.c:165
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr ""
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Kan ikke �pne �%s�: %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "ugyldig sertifikat"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "N�kkel tilgjengelig ved: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "generere et opphevingssertifikat"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Denne n�kkelen er utg�tt!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA-fingeravtrykk: "
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "bekrefte en signatur"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6715,7 +6793,7 @@ msgstr "preferansen %s er duplisert\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adressater\n"
@@ -6769,10 +6847,6 @@ msgstr "ugyldig sertifikat"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -6937,29 +7011,38 @@ msgstr "bruksm�te: gpg [valg] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+msgid "key generation is not available from the commandline\n"
+msgstr ""
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
diff --git a/po/pl.po b/po/pl.po
index fedd5b293..18c1c6970 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -42,36 +42,41 @@ msgid ""
 "this session"
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "linia zbyt d�uga\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "has�o zbyt d�ugie\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "b��d MPI"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "niepoprawne has�o"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "niepoprawne has�o"
@@ -81,21 +86,21 @@ msgstr "niepoprawne has�o"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -167,28 +172,49 @@ msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "U�y� tego klucza pomimo to? "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Has�o\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmiana has�a klucza"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmiana has�a klucza"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -199,253 +225,253 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, 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:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, 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:1373
+#: agent/gpg-agent.c:1379
 #, 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:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, 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:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu kluczy pomini�tych\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, 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:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -473,40 +499,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "niepoprawne has�o"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Anuluj"
@@ -665,12 +691,12 @@ msgstr "problem z porozumiewaniem si� z agentem\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
@@ -736,77 +762,77 @@ msgstr ""
 msgid "cC"
 msgstr "l"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "niepoprawny nag��wek opakowania: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "nag��wek opakowania: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "niew�a�ciwy nag��wek dokumentu z podpisem na ko�cu\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "zagnie�d�one podpisy na ko�cu dokumentu\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "przewczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "B��d sumy CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -860,8 +886,8 @@ msgstr "brak klucza prywatnego"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
@@ -935,7 +961,7 @@ msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
@@ -1049,7 +1075,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
@@ -1073,7 +1099,7 @@ msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
@@ -1082,7 +1108,7 @@ msgstr "wyj�cie z tego menu"
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
@@ -1139,7 +1165,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Polecenie> "
 
@@ -1158,27 +1184,27 @@ msgstr "sprzeczne polecenia\n"
 msgid "Admin commands are not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
@@ -1220,92 +1246,92 @@ msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "ustawiony tryb S2K nie pozwala u�y� pakietu ESK dla szyfru symetrycznego\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "szyfrem %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na szyfrowa� dla kluczy RSA kr�tszych od 2048 bit�w\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "nie mo�na u�y� szyfru IDEA z wszystkimi kluczami dla kt�rych szyfrujesz.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "OSTRZE�ENIE: wiadomo�� by�a szyfrowana kluczem s�abym szyfru symetrycznego.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "problem podczas obr�bki pakietu szyfrowego\n"
 
@@ -1398,41 +1424,41 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: klucz PGP 2.x - pomini�ty\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "OSTRZE�ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
@@ -1457,7 +1483,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pomini�ty\n"
@@ -1472,7 +1498,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1480,128 +1506,132 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1612,47 +1642,47 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1660,7 +1690,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1681,15 +1711,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1699,7 +1729,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1707,73 +1737,73 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1781,21 +1811,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1803,472 +1833,472 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
 "dost�pu\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, 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:2472
+#: g10/gpg.c:2511
 #, 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:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, 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:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -2649,425 +2679,425 @@ msgstr "bezu�yteczny klucz prywatny"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pomini�tych nowych kluczy: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "      nie w��czono do zbioru: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokaln� kopi�\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pomini�ty\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
 "              uniwa�nienia\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %08lX: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "klucz %08lX: algorytm asymetryczny \"%s\" nie jest obs�ugiwany\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pomini�ty\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: pomini�to certyfikat uniewa�nienia umieszczony \n"
 "              w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: pomini�to -  niepoprawny certyfikat uniewa�nienia: %s\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %08lX: do��czono powt�rzony identyfikator u�ytkownika\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %08lX.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
@@ -3177,12 +3207,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
@@ -3393,8 +3423,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
@@ -3403,20 +3433,20 @@ msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
@@ -3433,11 +3463,11 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3445,209 +3475,209 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3655,242 +3685,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nieznana klasa podpisu"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Adnotacja: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3898,19 +3928,19 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "data"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3919,7 +3949,7 @@ msgstr ""
 "             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
 "             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3928,54 +3958,74 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "niepoprawny"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3985,199 +4035,199 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na cofn�� wyznaczenia klucza jako uniewa�niaj�cego!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N): "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %08lX nie jest skro�nie podpisany\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "OSTRZE�ENIE: identyfikator u�ytkownika podpisany za %d sekund (w "
 "przysz�o�ci)\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zdj�cie w formacie %s, rozmiar %ld bajt�w, klucz 0x%08lX (id %d).\n"
@@ -4220,12 +4270,12 @@ msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
@@ -4533,19 +4583,19 @@ msgstr ""
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4557,7 +4607,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4573,50 +4623,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4625,12 +4675,12 @@ msgstr ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
 "mo�na doda� do niego podklucz szyfruj�cy.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4638,7 +4688,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4646,27 +4696,27 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
@@ -4812,7 +4862,7 @@ msgstr "wy�kl"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
@@ -4847,313 +4897,313 @@ msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 msgid "searching for names from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "%d - dziwny rozmiar jak na zaszyfrowany klucz sesyjny\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "zaszyfrowano %u-bitowym kluczem %s, numer %08lX, stworzonym %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomoc� %lu hase�\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym has�em\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "szyfr IDEA nie jest dost�pny, pr�ba u�ycia %s zamiast\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go wczyta�\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "OSTRZE�ENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -5187,56 +5237,66 @@ msgstr "podpis %s, skr�t %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = potrzebuj� wi�cej informacji\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nieskompresowany"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
@@ -5295,7 +5355,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
@@ -5323,12 +5383,12 @@ msgstr "Has�o\n"
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5338,12 +5398,12 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5394,23 +5454,23 @@ msgstr "Czy zdj�cie jest w porz�dku? (t/N/w) "
 msgid "unable to display photo ID!\n"
 msgstr "nie mo�na wy�wietli� zdj�cia!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "nie podano przyczyny"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "klucz zosta� zast�piony"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "klucz zosta� skompromitowany"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "klucz nie jest ju� u�ywany"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "identyfikator u�ytkownika przesta� by� poprawny"
 
@@ -5481,7 +5541,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
@@ -5525,113 +5585,113 @@ msgstr ""
 "mo�esz odpowiedzie� ,,tak'' na nast�pne pytanie.\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "U�y� tego klucza pomimo to? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony\n"
 "             (brak klucza uniewa�niaj�cego aby to sprawdzi�)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "             To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten podklucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Uwaga: Ten klucz zosta� wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a podpis.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "             Ten podpis prawdopodobnie jest FA�SZYWY.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�co zaufane podpisy!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a ten "
 "podpis.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nie zosta� podany identyfikatora u�ytkownika (np za pomoc� ,,-r'')\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5639,42 +5699,42 @@ msgstr ""
 "\n"
 "Identyfikator u�ytkownika (pusta linia oznacza koniec): "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy��czony z u�ycia.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresat�w\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
@@ -5684,27 +5744,32 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5738,7 +5803,7 @@ msgid "NOTE: key has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
@@ -5761,11 +5826,11 @@ msgstr "(to jest czu�y klucz uniewazniaj�cy)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "wymuszono opakowanie ASCII wyniku.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "wywo�anie funkcji make_keysig_packet nie powiod�o si�: %s\n"
@@ -5779,34 +5844,34 @@ msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "UWAGA: Ten klucz nie jest chroniony!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5830,33 +5895,33 @@ msgstr ""
 "komputer�w mog� zachowa� tre�� wydruku i udost�pni� j� osobom "
 "nieupowa�nionym.\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Prawdopodobnie chcesz tu wybra� %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Wprowad� opis (nieobowi�zkowy) i zako�cz go pust� lini�:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Pow�d uniewa�nienia: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(nie podano)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Informacje poprawne? "
@@ -6036,27 +6101,27 @@ msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
 "podpis�w\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 mo�na podpisywa� tylko za pomoc� kluczy z wersji 2.x\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
@@ -6444,7 +6509,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6454,11 +6519,16 @@ msgstr ""
 "Nale�y pami�ta� o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
 "argumentu linii polece�.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "nie mo�na otworzy� ,,%s'': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6522,52 +6592,61 @@ msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6575,113 +6654,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "generacja nowej pary kluczy"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
@@ -6748,7 +6826,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
@@ -6772,148 +6850,148 @@ 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:159
+#: sm/certchain.c:165
 #, 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:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Poprawny certyfikat"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Klucz dost�pny w: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Poprawny certyfikat"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "b��d przy odczycie certyfikatu: %s\n"
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "b��d przy odczycie certyfikatu: %s\n"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Odcisk klucza:"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, 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:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "sprawdzenie podpisu"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7077,7 +7155,7 @@ msgstr "podw�jny certyfikat - usuni�ty"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(nie podano)\n"
@@ -7131,10 +7209,6 @@ msgstr "Poprawny certyfikat"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7291,29 +7365,39 @@ msgstr "spos�b u�ycia: gpgm [opcje]"
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Prosz� wybra� rodzaj klucza:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8133,18 +8217,6 @@ msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 #~ msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "Brak identyfikatora u�ytkownika dla klucza.\n"
 
diff --git a/po/pt.po b/po/pt.po
index 9690d50a3..d52aacb9f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -35,36 +35,41 @@ msgid ""
 "this session"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido no nome\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorrecta"
@@ -74,21 +79,21 @@ msgstr "frase secreta incorrecta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -159,29 +164,50 @@ msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Usar esta chave de qualquer modo? "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Insira a frase secreta\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -192,253 +218,253 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, 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:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, 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:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -466,40 +492,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
@@ -658,12 +684,12 @@ msgstr "problemas na comunica��o com o gpg-agent\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
@@ -730,77 +756,77 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "erro na �ltima linha\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -854,8 +880,8 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
@@ -929,7 +955,7 @@ msgstr "a escrever chave p�blica para `%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1041,7 +1067,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -1065,7 +1091,7 @@ msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -1074,7 +1100,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -1131,7 +1157,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Comando> "
 
@@ -1150,27 +1176,27 @@ msgstr "comandos em conflito\n"
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
@@ -1212,54 +1238,54 @@ msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "n�o � poss�vel utilizar o pacote ESK sim�trico devido ao modo S2K\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "no modo --pgp2 s� pode cifrar com chaves RSA de 2048 bits ou menos\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "imposs�vel utilizar a cifra IDEA para todas as chaves para que est� a "
 "cifrar.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1268,39 +1294,39 @@ msgstr ""
 "ao for�ar o algoritmo de compress�o %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi cifrada com uma chave fraca na cifragem sim�trica.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao tratar pacote cifrado\n"
 
@@ -1390,41 +1416,41 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1448,7 +1474,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
@@ -1463,7 +1489,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1471,128 +1497,132 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1603,51 +1633,51 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1655,7 +1685,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1675,15 +1705,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1693,7 +1723,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1701,556 +1731,556 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
 "inseguras\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, 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:2472
+#: g10/gpg.c:2511
 #, 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:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, 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:2759
+#: g10/gpg.c:2798
 #, 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:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 #, 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:3020
+#: g10/gpg.c:3059
 #, 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:3023
+#: g10/gpg.c:3062
 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:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, 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:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 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:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -2637,423 +2667,423 @@ msgstr "chave secreta n�o utiliz�vel"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        n�o importadas: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
 "08lX\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -3162,12 +3192,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
@@ -3379,8 +3409,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3389,20 +3419,20 @@ msgstr "assinatura falhou: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3419,11 +3449,11 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3431,209 +3461,209 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3641,242 +3671,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando n�o � permitido no modo %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3884,25 +3914,25 @@ msgstr ""
 "N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
 "correcta a n�o ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3911,56 +3941,76 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Utilizador \"%s\" est� revocado."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Utilizador \"%s\" est� revocado."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Utilizador \"%s\" est� revocado."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3969,198 +4019,198 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4204,12 +4254,12 @@ msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
@@ -4516,7 +4566,7 @@ msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4524,12 +4574,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4541,7 +4591,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4553,50 +4603,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma hip�tese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4605,12 +4655,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4618,7 +4668,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4626,26 +4676,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -4791,7 +4841,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "op��es de exporta��o inv�lidas\n"
@@ -4826,316 +4876,316 @@ msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 msgid "searching for names from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifra IDEO n�o dispon�vel, a tentar utilizar %s em substitui��o\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: v�rias assinaturas detectadas.  Apenas a primeira ser� verificada.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -5171,57 +5221,67 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrar mais informa��es\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+
+#: g10/misc.c:813
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
@@ -5278,7 +5338,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
@@ -5308,12 +5368,12 @@ msgstr "Insira a frase secreta\n"
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5323,12 +5383,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5376,23 +5436,23 @@ msgstr "Est� correto (s/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "A chave foi substitu�da"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "A chave foi comprometida"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "A chave j� n�o � utilizada"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador j� n�o � v�lido"
 
@@ -5463,7 +5523,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Decis�o? "
 
@@ -5509,113 +5569,113 @@ msgstr ""
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: A utilizar uma chave que n�o � de confian�a!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave foi desactivada.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "N�o especificou um identificador de utilizador. (pode usar \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5623,42 +5683,42 @@ msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� colocada como destinat�rio por omiss�o\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
@@ -5667,27 +5727,32 @@ msgstr "chave %08lX: sem ID de utilizador\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o gravados; use a op��o \"--output\" para grav�-los\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "imposs�vel abrir dados assinados `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5721,7 +5786,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
@@ -5744,11 +5809,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
@@ -5763,36 +5828,36 @@ msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5803,37 +5868,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
@@ -6011,11 +6076,11 @@ msgstr "verifica��o da assinatura criada falhou: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6023,15 +6088,15 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar � vista com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
@@ -6420,7 +6485,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6430,11 +6495,16 @@ msgstr ""
 "N�o se esque�a que o ficheiro com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro a ser dado na linha de comando.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "imposs�vel abrir `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6498,52 +6568,61 @@ msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6551,113 +6630,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%s' j� comprimido\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -6724,7 +6802,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
@@ -6748,139 +6826,139 @@ 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:159
+#: sm/certchain.c:165
 #, 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:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra impress�o digital"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7045,7 +7123,7 @@ msgstr "prefer�ncia %c%lu duplicada\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "resposta do agente inv�lida\n"
@@ -7099,10 +7177,6 @@ msgstr "certificado incorrecto"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7263,29 +7337,39 @@ msgstr "uso: gpg [op��es] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Por favor selecione o tipo de chave desejado:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8070,18 +8154,6 @@ msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 #~ msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Utilizador \"%s\" est� revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Utilizador \"%s\" est� revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Utilizador \"%s\" est� revocado."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e2eeeac96..9c76f322f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -39,36 +39,41 @@ msgid ""
 "this session"
 msgstr "Por favor digite a frase secreta"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caractere inv�lido no nome\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorreta"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorreta"
@@ -78,21 +83,21 @@ msgstr "frase secreta incorreta"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -164,29 +169,50 @@ msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Usa esta chave de qualquer modo? "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Digite a frase secreta: "
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -197,251 +223,251 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, 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:1373
+#: agent/gpg-agent.c:1379
 #, 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:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -469,40 +495,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorreta"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 msgid "cancelled\n"
 msgstr ""
 
@@ -659,11 +685,11 @@ msgstr ""
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -730,77 +756,77 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -856,8 +882,8 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
@@ -930,7 +956,7 @@ msgstr "escrevendo certificado p�blico para `%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1044,7 +1070,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -1068,7 +1094,7 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -1077,7 +1103,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -1134,7 +1160,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Comando> "
 
@@ -1154,27 +1180,27 @@ msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1217,90 +1243,90 @@ msgstr "h� uma chave secreta para esta chave p�blica!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, fuzzy, c-format
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
 "sim�trica.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "eliminar o campo keyid dos pacotes criptografados\n"
@@ -1390,41 +1416,41 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1448,7 +1474,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
@@ -1463,7 +1489,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1471,134 +1497,138 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1609,57 +1639,57 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1679,15 +1709,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1697,7 +1727,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1705,564 +1735,564 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, 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:2472
+#: g10/gpg.c:2511
 #, 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:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2933
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2939
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2952
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 #, 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:3020
+#: g10/gpg.c:3059
 #, 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:3023
+#: g10/gpg.c:3062
 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:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3175
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, 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:3244
+#: g10/gpg.c:3283
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3412
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, 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:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -2595,419 +2625,419 @@ msgstr "chave secreta incorreta"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importados: %lu"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -3122,13 +3152,13 @@ msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -3319,8 +3349,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3329,21 +3359,21 @@ msgstr "assinatura falhou: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3360,12 +3390,12 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3373,208 +3403,208 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3582,522 +3612,542 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de usu�rio!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "A chave � protegida.\n"
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4145,12 +4195,12 @@ msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
@@ -4456,7 +4506,7 @@ msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4464,12 +4514,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4481,7 +4531,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4493,50 +4543,50 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4545,12 +4595,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para criptografia. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4558,7 +4608,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4566,26 +4616,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -4739,7 +4789,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inv�lido"
@@ -4774,316 +4824,316 @@ msgstr "exportar chaves para um servidor"
 msgid "searching for names from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -5117,57 +5167,67 @@ msgstr "assinatura %s de: %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/misc.c:813
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
@@ -5224,7 +5284,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
@@ -5255,12 +5315,12 @@ msgstr "Digite a frase secreta: "
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5270,12 +5330,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5323,25 +5383,25 @@ msgstr "Est� correto (s/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 #, fuzzy
 msgid "Key is superseded"
 msgstr "A chave � protegida.\n"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -5414,7 +5474,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Sua decis�o? "
 
@@ -5458,157 +5518,157 @@ msgstr ""
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 #, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 #, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Voc� n�o especificou um identificador de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� marcada como destinat�rio padr�o\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
@@ -5617,28 +5677,33 @@ msgstr "chave %08lX: sem ID de usu�rio\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "imposs�vel abrir dados assinados `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5673,7 +5738,7 @@ msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
@@ -5696,11 +5761,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
@@ -5715,37 +5780,37 @@ msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 #, fuzzy
 msgid "public key does not match secret key!\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5756,34 +5821,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
@@ -5951,25 +6016,25 @@ msgstr "leitura de registro de assinatura falhou: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
@@ -6361,7 +6426,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6371,11 +6436,16 @@ msgstr ""
 "Por favor lembre-se de que o arquivo com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro arquivo dado na linha de comando.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "imposs�vel abrir `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6439,52 +6509,61 @@ msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6492,113 +6571,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%lu chaves processadas\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -6665,7 +6743,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
@@ -6688,148 +6766,148 @@ 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:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correto"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correto"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "erro de leitura do certificado: %s\n"
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 #, fuzzy
 msgid "certificate not yet valid"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "erro de leitura do certificado: %s\n"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Impress�o digital:"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 #, fuzzy
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6994,7 +7072,7 @@ msgstr "certificado duplicado - removido"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "nenhum endere�o v�lido\n"
@@ -7048,10 +7126,6 @@ msgstr "Certificado correto"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7210,29 +7284,38 @@ msgstr "Uso: gpgm [op��es] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+msgid "key generation is not available from the commandline\n"
+msgstr ""
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Por favor selecione o tipo de chave desejado:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8013,18 +8096,6 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 #~ msgstr "imposs�vel abrir %s: %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "A chave � protegida.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "A chave � protegida.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "A chave � protegida.\n"
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "Nenhum identificador de usu�rio para chave\n"
 
diff --git a/po/ro.po b/po/ro.po
index d27d9b1f6..8f66e2dc8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -37,36 +37,41 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lung�"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid �n nume\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "fraz�-parol� incorect�"
@@ -76,21 +81,21 @@ msgstr "fraz�-parol� incorect�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -162,29 +167,50 @@ msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Folosi�i oricum aceast� cheie? (d/N) "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Introduce�i fraza-parol�\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -195,252 +221,252 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -468,25 +494,25 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -494,17 +520,17 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "anulat�"
@@ -663,12 +689,12 @@ msgstr "probleme de comunicare cu gpg-agent\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
@@ -733,75 +759,75 @@ msgstr "oO"
 msgid "cC"
 msgstr "cC"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "armur�: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "header armur� invalid: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "header armur�: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "header clearsig invalid\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "semn�turi text �n clar �ncuib�rite\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 msgid "unexpected armor: "
 msgstr "armur� nea�teptat�: "
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "linie cu liniu�� escape invalid�: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 invalid %02X s�rit\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (nici un CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (�n CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "CRC anormal\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "eroare CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (�n trailer)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "eroare linia de trailer\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -855,8 +881,8 @@ 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:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
@@ -924,7 +950,7 @@ msgstr "URL pentru a aduce cheia public�: "
 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:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -1029,7 +1055,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
@@ -1049,7 +1075,7 @@ msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
@@ -1057,7 +1083,7 @@ msgstr "ie�i din acest meniu"
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
@@ -1109,7 +1135,7 @@ msgstr "meniu pentru a schimba sau debloca PIN-ul"
 msgid "verify the PIN and list all data"
 msgstr "verific� PIN-ul �i listeaz� toate datele"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Comand�> "
 
@@ -1125,27 +1151,27 @@ msgstr "Sunt permise comenzi administrare\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
@@ -1186,47 +1212,47 @@ msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "nu pot crea un pachet ESK simetric datorit� modului S2K\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "folosesc cifrul %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "�n modul --pgp2 pute�i cifra numai cu chei RSA de 2048 bi�i sau mai pu�in\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "citesc din `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "nu pot folosi cifrul IDEA pentru pentru toate cheile pentru care cifra�i.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1234,7 +1260,7 @@ msgstr ""
 "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1243,38 +1269,38 @@ msgstr ""
 "AVERTISMENT: for��nd algoritmul de compresie %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTISMENT: mesajul a fost cifrat cu o cheie slab� din cifrul simetric.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "problem� cu m�nuirea pachetului cifrat\n"
 
@@ -1365,40 +1391,40 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 msgid "exporting secret keys not allowed\n"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cheia %s: nu e protejat� - s�rit�\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cheia %s: cheie stil PGP 2.x - s�rit�\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVERTISMENT: cheia secret� %s nu are un checksum SK simplu\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
@@ -1421,7 +1447,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
@@ -1436,7 +1462,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1444,127 +1470,131 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1575,47 +1605,47 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1623,7 +1653,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1643,15 +1673,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1661,7 +1691,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1669,77 +1699,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1747,21 +1777,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1769,468 +1799,468 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, 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:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "extensie cifru `%s' nu a fost �nc�rcat din cauza permisiunilor nesigure "
 "(unsafe)\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 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:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 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:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -2629,422 +2659,422 @@ msgstr "cheie secret� de nefolosit"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "bloc de tip %d s�rit\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chei procesate p�n� acum\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Num�r total procesate: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      chei noi s�rite: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  f�r� ID-uri utilizator: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "               importate: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             neschimbate: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "   noi ID-uri utilizator: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             noi subchei: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           noi semn�turi: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    noi revoc�ri de chei: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chei secrete importate: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chei secrete neschimbate: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            ne importate: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm rezumat %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm compresie %s\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 "este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
 "algoritm\n"
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nou� - s�rit�\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %s: cheia public� \"%s\" importat�\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secret� importat�\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cheia %s: deja �n inelul de chei secrete\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cheia %s: cheia secret� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
 "\"\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalid�\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalid�\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am s�rit subcheia\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
 "prezent�.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOT�: S/N-ul unei chei nu se potrive�te cu cel al cardului\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOT�: cheia primar� este online �i stocat� pe card\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOT�: cheia secundar� este online �i stocat� pe card\n"
 
@@ -3155,12 +3185,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
@@ -3347,8 +3377,8 @@ msgstr "Am verificat aceast� cheie foarte atent.\n"
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
@@ -3359,19 +3389,19 @@ msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
 "parol� de schimbat.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
@@ -3388,11 +3418,11 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3400,190 +3430,190 @@ msgstr ""
 "Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� face�i acest lucru? (d/N) "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "mut o semn�tur� de cheie �n locul corect\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 msgid "show key fingerprint"
 msgstr "afi�eaz� amprenta cheii"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "enumer� chei �i ID-uri utilizator"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 msgid "select subkey N"
 msgstr "selecteaz� subcheia N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 msgid "check signatures"
 msgstr "verific� semn�turi"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "semneaz� ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
 "relevante]"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs locally"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "adaug� un ID utilizator"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "adaug� o poz� ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 msgid "delete selected user IDs"
 msgstr "�terge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 msgid "add a subkey"
 msgstr "adaug� o subcheie"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr "mut� o cheie pe un smartcard"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr "mut� o cheie de rezerv� pe un smartcard"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 msgid "delete selected subkeys"
 msgstr "�terge subcheile selectate"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "adaug� o cheie de revocare"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 msgid "delete signatures from the selected user IDs"
 msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr "marcheaz� ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 msgid "toggle between the secret and public key listings"
 msgstr "comut� �ntre listele de chei secrete �i publice"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "enumer� preferin�ele (expert)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "afi�eaz� preferin�ele (detaliat)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 msgid "set preference list for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
 "selectate"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "revoke selected user IDs"
 msgstr "revoc� ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 msgid "enable key"
 msgstr "activeaz� cheia"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 msgid "disable key"
 msgstr "deactiveaz� cheia"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr "arat� pozele pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eroare la citire keyblock secret \"%s\": %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Cheia secret� este disponibil�.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3595,228 +3625,228 @@ msgstr ""
 "  pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
 "  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "Cheia este revocat�."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Tip de semn�tur� necunoscut `%s'\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie s� selecta�i exact o cheie.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? (d/N) "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i toat� cheia? (d/N) "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
 "de �ncredere furnizat� de utilizator\n"
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr "Seteaz� lista de preferin�e ca:\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
 "selectate? (d/N) "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota�ie:"
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3825,17 +3855,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3844,7 +3874,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3853,54 +3883,74 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "invalid(�)"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "ID utilizator \"%s\" a fost revocat."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "ID utilizator \"%s\" a fost revocat."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "ID utilizator \"%s\" a fost revocat."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3910,196 +3960,196 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
 "anulat�!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
@@ -4139,12 +4189,12 @@ msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
@@ -4443,7 +4493,7 @@ msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4451,12 +4501,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4467,7 +4517,7 @@ msgstr ""
 "O s� o fac oricum.  Pute�i schimba fraza-parol� oric�nd, folosind acest\n"
 "program cu op�iunea \"--edit-key\".\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4479,50 +4529,50 @@ msgstr ""
 "�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
 "numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4532,12 +4582,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4545,7 +4595,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4553,25 +4603,25 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nu pot crea fi�ier de rezerv� `%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOT�: copia de siguran�a a cheii cardului salvat� la `%s'\n"
@@ -4717,7 +4767,7 @@ msgstr "deactivat(�)"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
@@ -4751,310 +4801,310 @@ msgstr "caut \"%s\" de pe serverul %s %s\n"
 msgid "searching for names from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "trimit cheia %s serverului %s %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 msgid "no keyserver action!\n"
 msgstr "nici o ac�iune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
 "s)\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "apeluri c�tre server de chei extern nu este suportat de acest program\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nu suport� versiunea de manipulator (handler) %d\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 msgid "keyserver timed out\n"
 msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 msgid "keyserver internal error\n"
 msgstr "eroare intern� server de chei\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "eroare de comunicare server de chei: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "reactualizez 1 cheie de la %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "reactualizez %d chei de la %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrat�\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "fraza-parol� generat� cu un algoritm rezumat necunoscut %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia public� este %s\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie public�: DEK bun\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrat cu cheia %u-bit %s, ID %s, creat� %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie public� a e�uat: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrat� cu %lu fraze-parol�\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrat� cu 1 fraz�-parol�\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "cifru IDEA indisponibil, vom �ncerca s� folosim %s �n loc\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fi�ier original='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Semn�tur� f�cut� %s folosind cheia %s cu ID %s\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semn�tur� INCORECT� din \"%s\""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semn�tur� expirat� din \"%s\""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVERTISMENT: am detectat multiple semn�turi.  Numai prima va fi verificat�.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "semn�tur� de sine st�t�toare (standalone) de clas� 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
@@ -5088,56 +5138,66 @@ msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = arat�-mi mai multe informa�ii\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTISMENT: \"%s\" este o comand� �nvechit� - nu o folosi�i\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
@@ -5196,7 +5256,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %s)"
@@ -5225,12 +5285,12 @@ msgstr "Introduce�i fraza-parol�\n"
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5239,12 +5299,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
 "utilizator: \"%s\"\n"
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %u-bit %s, ID %s, creat� %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subcheie pe cheia principal� ID %s)"
@@ -5296,23 +5356,23 @@ msgstr "Este aceast� poz� corect� (d/N/t)? "
 msgid "unable to display photo ID!\n"
 msgstr "nu pot afi�a poza ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Nici un motiv specificat"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "Cheia este �nlocuit�"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "Cheia a fost compromis�"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "Cheia nu mai este folosit�"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "ID utilizator nu mai este valid"
 
@@ -5380,7 +5440,7 @@ msgstr ""
 "Nivelul minim de �ncredere pentru aceast� cheie este: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Decizia d-voastr�? "
 
@@ -5425,111 +5485,111 @@ msgstr ""
 "utilizator.  Dac� �ti�i *cu adev�rat* ce face�i, pute�i\n"
 "r�spunde cu da la urm�toarea �ntrebare.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "Folosi�i oricum aceast� cheie? (d/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "AVERTISMENT: aceast� cheie poate fi revocat� (cheia de revocare nu este "
 "prezent�)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Not�: Aceast� cheie a expirat!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� de o semn�tur� de �ncredere!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nu exist� nici o indica�ie c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Semn�tura este probabil un FALS.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� cu suficiente semn�turi de "
 "�ncredere!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nu este sigur c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nu a�i specificat un ID utilizator. (pute�i folosi \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr "Destinatari curen�i:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5537,42 +5597,42 @@ msgstr ""
 "\n"
 "Introduce�i ID-ul utilizator.  Termina�i cu o linie nou�: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Nu exist� acest ID utilizator.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Cheia public� este deactivat�.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "s�rit�: cheia public� setat� deja\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatar implicit necunoscut \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: s�rit�: cheia public� este deactivat�\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "nici un destinatar valid\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
@@ -5582,27 +5642,32 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "datele nu au fost salvate: folosi�i op�iunea \"--output\" pentru a le salva\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Semn�tur� deta�at�.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "V� rug�m introduce�i numele fi�ierului de date: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "citesc stdin ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "nici o dat� semnat�\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nu pot deschide date semnate `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "nu pot deschide date semnate `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5638,7 +5703,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a e�uat: %s\n"
@@ -5660,11 +5725,11 @@ msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare desemnat pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "Ie�ire �n armur� ASCII for�at�.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a e�uat: %s\n"
@@ -5678,33 +5743,33 @@ msgstr "Certificat de revocare creat.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "nici o cheie public� corespunz�toare: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "algoritm de protec�ie necunoscut\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOT�: Aceast� cheie nu este protejat�!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5722,33 +5787,33 @@ msgstr ""
 "caz c� mediumul este deteriorat.  Dar fi�i atent: sistemul de tip�rire al\n"
 "ma�inii d-voastr� ar putea p�stra datele �i s� le fac� accesibile altora!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Renun��"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motiv pentru revocare: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr "Este aceasta OK? (d/N) "
 
@@ -5924,11 +5989,11 @@ msgstr "verificarea semn�turii create a e�uat: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semn�tur� de la: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-data�at cu chei stil PGP 2.x numai �n modul --pgp2\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5936,15 +6001,15 @@ msgstr ""
 "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
 "destinatarului\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
@@ -6324,7 +6389,7 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "nu pot actualiza �nregistrare versiunii trustdb: scrierea a e�uat: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6334,11 +6399,16 @@ msgstr ""
 "V� rug�m aminti�i-v� c� fi�ierul de semn�tur� (.sig sau .asc)\n"
 "ar trebui s� fie primul dat �n linia de comand�.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "nu pot deschide `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6402,52 +6472,61 @@ msgstr "am e�uat s� stochez data cre�rii: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr "r�spunsul nu con�ine datele cheii publice\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr "r�spunsul nu con�ine modulul RSA\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
@@ -6455,109 +6534,108 @@ msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr "|A|PIN Admin"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 msgid "key already exists\n"
 msgstr "cheia exist� deja\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 msgid "generating new key\n"
 msgstr "generez o nou� cheie\n"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipse�te\n"
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 msgid "generating key failed\n"
 msgstr "generarea cheii a e�uat\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -6624,7 +6702,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 invalid %02X s�rit\n"
@@ -6648,139 +6726,139 @@ 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:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificat incorect"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cheie disponibil� la: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Aceast� cheie a expirat!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Amprenta CA: "
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verific� o semn�tur�"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6944,7 +7022,7 @@ msgstr "preferin�a `%s' duplicat�\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nici o descriere dat�)\n"
@@ -6999,10 +7077,6 @@ msgstr "certificat incorect"
 msgid "register a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7159,29 +7233,39 @@ msgstr "folosire: gpg [op�iuni] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8017,18 +8101,6 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 #~ msgstr "nu pot executa programul `%s': %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "ID utilizator \"%s\" a fost revocat."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "ID utilizator \"%s\" a fost revocat."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "ID utilizator \"%s\" a fost revocat."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
diff --git a/po/ru.po b/po/ru.po
index 98ee0d740..fc0f2b632 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: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2006-11-07 19:31+0300\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -33,31 +33,36 @@ msgid ""
 "this session"
 msgstr "Введите фразу-пароль для доступа к закрытому ключу"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 msgid "PIN too long"
 msgstr "PIN слишком длинен"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 msgid "Passphrase too long"
 msgstr "фраза-пароль слишком длинная"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 msgid "Invalid characters in PIN"
 msgstr "Недопустимый символ в PIN-коде"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr "PIN-код слишком короткий"
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 msgid "Bad PIN"
 msgstr "плохой PIN"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 msgid "Passphrase"
 msgstr "Фраза-пароль"
 
@@ -66,21 +71,21 @@ msgstr "Фраза-пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -151,25 +156,46 @@ msgstr "повторный PIN не совпал; попробуйте еще р
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Введите PIN%s%s%s для доступа к карте"
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Всё равно использовать данный ключ? (y/N)"
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Введите фразу-пароль\n"
+
+#: agent/genkey.c:146
 #, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr "Введите фразу-пароль%0Aдля защиты нового ключа"
 
-#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 msgid "Please re-enter this passphrase"
 msgstr "Повторно введите фразу-пароль:"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr "не совпало, попробуйте еще раз"
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 msgid ""
 "@Options:\n"
@@ -178,109 +204,109 @@ msgstr ""
 "@Параметры:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (foreground)"
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (background)"
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "вывод результатов в sh-стиле"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "вывод результатов в csh-стиле"
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr "не использовать кеш PIN при подписывании"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "позволить клиентам помечать ключи как \"доверяемые\""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "allow presetting passphrase"
 msgstr "разрешить предустановленную фразу-пароль"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr "разрешить эмуляцию ssh-агента"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние в файл"
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 msgid "Please report bugs to <"
 msgstr "О найденных ошибках сообщайте <"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -288,136 +314,136 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr "выход за безопасный предел памяти при распределении %lu байтов"
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при распределении %lu байтов"
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "ошибка связывния сокета с `%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "невозможно использовать `%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s: остановлен\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -449,21 +475,21 @@ msgstr ""
 "Синтаксис: gpg-protect-tool [параметры] [аргументы]\n"
 "Инструмент для работы с закрытыми ключами\n"
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Введите фразу-пароль для доступа к PKCS#12 объекту."
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Введите фразу-пароль для защиты нового PKCS#12 объекта."
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "Введите фразу-пароль для защиты импортированных в GnuPG объектов."
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -471,16 +497,16 @@ msgstr ""
 "Введите фразу-пароль или PIN\n"
 "необходимые для выполения данной операции."
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запроса ввода фразы-пароля: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 msgid "cancelled\n"
 msgstr "отменено\n"
 
@@ -639,11 +665,11 @@ msgstr "проблема связи с gpg-agent\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "проблема задания параметров gpg-agent\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 msgid "canceled by user\n"
 msgstr "прервано пользователем\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 msgid "problem with the agent\n"
 msgstr "проблема с агентом\n"
 
@@ -707,75 +733,75 @@ msgstr ""
 msgid "cC"
 msgstr ""
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "формат ASCII: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "неправильный заголовок ASCII: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "заголовок ASCII: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "неправильный заголовок прозрачной подписи\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "вложенные прозрачные подписи\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 msgid "unexpected armor: "
 msgstr "неожидаемый формат ASCII:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "неправильный отступ из минусов: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "недопустимый символ radix64 %02X пропущен\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "преждевременный конец файла (нет CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "преждевременный конец файла (в CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "поврежденный CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "ошибка CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr "преждевременный конец файла (в дополнении)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "ошибка в строке дополнения\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "неправильный ASCII формат: строка длиннее %d символов\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -828,8 +854,8 @@ msgstr "Карта OpenPGP недоступна: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
@@ -897,7 +923,7 @@ msgstr "URL для получения открытого ключа: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
@@ -1002,7 +1028,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
@@ -1022,7 +1048,7 @@ msgstr "секретные части ключа недоступны\n"
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
@@ -1030,7 +1056,7 @@ msgstr "выйти из этого меню"
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "показать данную справку"
 
@@ -1082,7 +1108,7 @@ msgstr "меню изменения или разблокировки PIN"
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN и показать все данные"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Команда> "
 
@@ -1098,27 +1124,27 @@ msgstr "Команды администрирования разрешены\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "ошибка чтения блока ключей: %s\n"
@@ -1159,90 +1185,90 @@ msgstr ""
 "сначала воспользуйтесь \"--delete-secret-keys\" для удаления закрытого "
 "ключа.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка создания фразы-пароля: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "не могу использовать симметричный пакет ESK в S2K режиме\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "использутся алгоритм шифрования %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "в режиме --pgp2 ключ RSA для ширования должен быть не более 2048 бит\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "читаю из `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "не могу использовать шифр IDEA для всех ключей.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ВНИМАНИЕ: использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "ВНИМАНИЕ: сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Нельзя использовать %s в режиме %s\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "Данные зашифрованы алгоритмом %s\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ВНИМАНИЕ: сообщение было зашифровано слабым ключом симметричного шифра.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "проблема обработки зашифрованного пакета\n"
 
@@ -1327,40 +1353,40 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 msgid "exporting secret keys not allowed\n"
 msgstr "экспорт секретных ключей не разрешен\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "ключ %s: не защищен - пропущен\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %s: стиля PGP 2.x - пропущен\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "ключ %s: ключ находится на карте - пропущен\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "сбой снятия защиты с подключа: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ВНИМАНИЕ: секретный ключ %s не имеет простой контрольной суммы SK\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
@@ -1385,7 +1411,7 @@ msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
@@ -1400,7 +1426,7 @@ msgstr "использую подклключ %s вместо главного �
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1408,127 +1434,131 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[файл]|создать подпись к файлу"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [файлы]|вывести хэши файлов"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr "запуск в режиме сервера"
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1539,47 +1569,47 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (0 без сжатия)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1587,7 +1617,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1607,15 +1637,15 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1625,7 +1655,7 @@ msgstr ""
 "Подписи и их проверка, зашифрование и расшифрование\n"
 "действие по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1633,92 +1663,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [параметры] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа у файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1726,457 +1756,457 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталога содержащего файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталогу содержащего файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr "отображать Фото ID при распечатке ключей"
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr "показывать ссылку на политики при распечатке подписей"
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 msgid "show all notations during signature listings"
 msgstr "показывать все примечания в списке подписей"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "показывать добавленные пользователем примечания при распечатке подписей"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показываеть предпочитаемый сервер ключей с списке подписей"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr "показывать действительность Used ID при распечатке ключей"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr "показывать отозванные и просроченные User ID при распечатке ключей"
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать отозванные и просроченные ключи при распечатке списка"
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 msgid "show the keyring name in key listings"
 msgstr "печатать имя таблиц ключей в списке ключей"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 msgid "show expiration dates during signature listings"
 msgstr "печатать даты истечения в списке подписей"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr "показывать Фото ID при проверке подписи"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr "показывать ссылку на политики при проверке подписи"
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 msgid "show all notations during signature verification"
 msgstr "показывать все примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr "показывать добавленные пользователем примечания при проверке подписей"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 msgid "show user ID validity during signature verification"
 msgstr "печатать действительность UserID при проверке подписей"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2933
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2939
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2952
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3175
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3141
+#: g10/gpg.c:3180
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[файл]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -2564,93 +2594,93 @@ msgstr "удалять неиспользуемые части из ключа �
 msgid "remove as much as possible from key after import"
 msgstr "удалять всё что возможно из ключа после импорта"
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропущен блок типа %d\n"
 
 # test it
-#: g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ключей обработано\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Всего обработано: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        пропущено новых ключей: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                   без User ID: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 импортировано: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  неизмененных: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                 новых User ID: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               новых подключей: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                новых подписей: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          новых отзывов ключей: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    прочитано секретных ключей: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "импортировано секретных ключей: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " неизмененных секретных ключей: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              не импортировано: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    подписей очищено: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      очищено User ID: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2659,327 +2689,327 @@ msgstr ""
 "ВНИМАНИЕ: ключ %s содержит предпочтения для недоступных\n"
 "алгоритмов для данных User IDs:\n"
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": предпочитает хеш-функцию %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": предпочитает сжатие %s\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "крайне желательно, чтобы Вы обновили Ваши предпочтения и\n"
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "распространите данный ключ, чтобы избежать потенциальных проблем "
 "несовпадения алгоритмов\n"
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "можете обновить список предпочтений используя: gpg --edit-key %s updpref "
 "save\n"
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: не имеет User ID\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: PKS повреждение подключа исправлено\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %s: принят несамоподписанный User ID \"%s\"\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет действительных User ID\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиной этого может быть отсутствие самоподписи\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: открытый ключ \"%s\" импортирован\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не совпадает с копией хранимой у нас\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не нахожу оригинальный блок ключей: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не могу прочитать оригинальный блок ключей: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый User ID\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых User ID\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: \"%s\" %d User ID очищен\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: \"%s\" %d  очищенных User ID\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 msgid "importing secret keys not allowed\n"
 msgstr "импортирование секретного ключа не позволено\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: секретный ключ импортирован\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "ключ %s: уже есть в таблице секретных ключей\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "ключ %s: не найден секретный ключ: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: \"%s\" сертификат отзыва импортирован\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет User ID для подписи\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неподдерживаемый алгоритм с открытым ключом у User ID \"%s\"\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: неправильная самоподпись на User ID \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа для связывания подключей\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: неподдерживаемый алгоритм с открытым ключом\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: неправильная связь подключей\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалено многократное связывание подключей\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа для отзывающего ключа\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неправильный отзыв подключа\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удалена многожественность подключей отзыва\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен User ID \"%s\"\n"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: не экспортируемая подпись (класс 0x%02X) - пропущена\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: direct key signature добавлена\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
 
@@ -3091,12 +3121,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите подписать? (y/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
@@ -3279,8 +3309,8 @@ msgstr "Я очень тщательно проверил этот ключ.\n"
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
@@ -3289,19 +3319,19 @@ msgstr "не удалось подписать: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
@@ -3318,11 +3348,11 @@ msgstr ""
 "Введите новую фразу-пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод фразы-пароля некорректен; попробуйте еще раз"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3330,184 +3360,184 @@ msgstr ""
 "Не хотите задать фразу-пароль? Это очень *ПЛОХАЯ* идея!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr "Действительно хотите сделать это? (y/N)"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "перемещение подписи ключа в правильное место\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "вывести список ключей и User ID"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 msgid "check signatures"
 msgstr "проверка подписей"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "подписать выбранные User ID [* описание соотв. команд см. ниже]"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs locally"
 msgstr "локально подписать выбранные User ID"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr "подписать выбранные User ID - trust подписью"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подписать выбранные User ID без возможности отзыва"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 msgid "delete selected user IDs"
 msgstr "удалить выбранные User ID"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на карту"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr "переместить резервную копию на смарткарту"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подписи у выбранных User ID"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "сменить срок действительности ключа или выбранных подключей"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранный User ID как главный"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 msgid "toggle between the secret and public key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 msgid "set preference list for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "установить URL предпочитаемого сервера ключей для выбранных User ID"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 msgid "set a notation for the selected user IDs"
 msgstr "установить примечание для выбранных User ID"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "сменить фразу-пароль"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подписи у выбранных User ID"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "revoke selected user IDs"
 msgstr "отзыв выбранных User ID"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 msgid "enable key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr "показать выбранные фото ID"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "сжать неиспользуемые User ID и удалить неиспользуемые подписи с ключа"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "сжать неиспользуемые User ID и удалить все подписи с ключа"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ошибка чтения секретного блока ключа \"%s\": %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3519,224 +3549,224 @@ msgstr ""
 "  `t' - trust подпись (tsign), `nr' - без возможности отзыва\n"
 "  (nrsign) или любым их сочетанием (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Действительно хотите подписать ВСЕ User ID? (y/N)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Совет: Выберите User ID для подписания\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Неизвестный тип подписи `%s'\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Следует выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Нельзя удалить последний User ID!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Действительно хотите удалить ВСЕ выбранные User IDs? (y/N)"
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr "Действительно хотите удалить данный User ID? (y/N)"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr "Действительно удалить главный ключ? (y/N)"
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr "Следует выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr "Команда ожидает аргумент: имя файла\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Не могу открыть `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Ошибка чтения резервного ключа с `%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Следует выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Действительно хотите удалить выбранные ключи? (y/N)"
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Действительно хотите удалить данный ключ? (y/N)"
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? (y/N)"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? (y/N)"
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Действительно хотите отозвать ключ целиком? (y/N)"
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Действительно хотите отозвать выбранные подключи? (y/N)"
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Действительно хотите отозвать данный подключ? (y/N)"
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Невозможно присвоить степень доверия пока используется указанная "
 "пользователем таблица доверий\n"
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr "Установить предпочтения в:\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? (y/N)"
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N)"
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N)"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Опции: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 msgid "Notations: "
 msgstr "Примечания: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3744,17 +3774,17 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока программа не будет перезапущена.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "просрочен с"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3762,7 +3792,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный. Данная команда может\n"
 "              воспользоваться другим user ID, используя его как главный.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3771,54 +3801,74 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Нельзя добавлять фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "недопустимый"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID \"%s\": уже очищен\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "ключ %s: \"%s\" %d подпись очищена\n"
+
 #: g10/keyedit.c:3252
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID \"%s\": уже очищен\n"
+
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3827,187 +3877,187 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Нельзя добавлять назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Нельзя изменять срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "подписываемый подключ %s уже имеет перекрестную сертификацию\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "подключ %s не подписывающий и не нуждается в перекрестной подписи\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr "Введите примечание:"
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 msgid "Proceed? (y/N) "
 msgstr "Обработать? (y/N) "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
@@ -4047,12 +4097,12 @@ msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
@@ -4352,7 +4402,7 @@ msgstr ""
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4360,12 +4410,12 @@ msgstr ""
 "Для защиты секретного ключа необходима фраза-пароль.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4377,7 +4427,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4390,50 +4440,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4441,44 +4491,44 @@ msgstr ""
 "Учтите, данный ключ не может использоваться для шифрования.  Можно\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "ЗАМЕЧАНИЕ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: архивная копия ключа карты сохранена в `%s'\n"
@@ -4622,7 +4672,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Введите число(а), N) Следующий или Q) Выход> "
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
@@ -4656,305 +4706,305 @@ msgstr "поиск по именам %s на сервере %s\n"
 msgid "searching for names from %s\n"
 msgstr "поиск по именам на %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "отправляю ключ %s на %s сервер %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 msgid "no keyserver action!\n"
 msgstr ""
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "данная сборка не поддерживает внешние вызовы для сервера ключей.\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "нет обработчика для схемы сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "действие `%s' не поддерживается схемой сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s не поддерживает версию обработчика %d\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 msgid "keyserver timed out\n"
 msgstr "превышено время ожидания сервера ключей\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ошибка связи с сервером ключей: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "обновление 1 ключа из %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно загрузить ссылку %s: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ВНИМАНИЕ: невозможно проанализировать ссылку %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "сеансовый ключ зашифрован %s\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "фраза-пароль создана с незнакомой хеш-фкнкцией %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ %s\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: правильный DEK\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s, с ID %s, созданным %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с ID %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифрования с открытым ключом: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано с %lu фразами-паролями\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано с 1 фразой-паролем\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "принятие %s зашифрованных данных\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробуйте использовать взамен %s\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "расшифровано\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ВНИМАНИЕ: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ВНИМАНИЕ: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАМЕЧАНИЕ: отправитель требует \"только для просмотра Вами\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "оригинальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 msgid "no signature found\n"
 msgstr "подпись не найдена\n"
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать эти множественные подписи\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись создана %s ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Ключ доступен на:"
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись от  \"%s\""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4992,56 +5042,66 @@ msgstr "ВНИМАНИЕ: используется эксперименталь�
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "модуль поддержки шифра IDEA не обнаружен\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "для дополнительной информации см. %s\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте \"%s%s\" взамен\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "ВНИМАНИЕ: команда \"%s\" является устаревшей - не следует применять ее\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Без сжатия"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
@@ -5099,7 +5159,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (главный ключ ID %s)"
@@ -5127,12 +5187,12 @@ msgstr "Введите фразу-пароль\n"
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "проблема с агентом: %s\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5140,12 +5200,12 @@ msgid ""
 msgstr ""
 "Необходима фраза-пароль для доступа к секретному ключу пользователя: \"%s\"\n"
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %s, создан %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (подключ на главном ключе %s)"
@@ -5195,23 +5255,23 @@ msgstr "Данное фото правильное (y/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "не могу отобразить Фото ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Без указания причины"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "Ключ заменён другим"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "Ключ был скомпрометирован"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "Ключ больше не используется"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "User ID больше не действителен"
 
@@ -5279,7 +5339,7 @@ msgstr ""
 "Минимальный уровень доверия данному ключу: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Ваше решение (?-подробнее)? "
 
@@ -5325,106 +5385,106 @@ msgstr ""
 "в User ID ключа.  Если ТОЧНО знаете, что делаете,\n"
 "можете ответить на следующий вопрос утвердительно.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "Всё равно использовать данный ключ? (y/N)"
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ВНИМАНИЕ: Использование недоверяемого ключа!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "ВНИМАНИЕ: возможно данный ключ отозван (ключ отзыва отсутствует)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван ключом назначенным отзывающим!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван его владельцем!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Это может означать, что подпись поддельная.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Данный подключ был отозван его владельцем!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Замечание: Данный ключ отключен.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: Проверенный адрес подписавшего `%s'\n"
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "ЗАМЕЧАНИЕ: Адрес подписавшего `%s' не соответствует формату DNS\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Замечание: Данный ключ просрочен!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ВНИМАНИЕ: Данный ключ не заверен доверенной подписью!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Нет указаний на то, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ВНИМАНИЕ: НЕТ ДОВЕРИЯ данному ключу!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Возможно, что подпись ПОДДЕЛАНА.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ВНИМАНИЕ: Этот ключ не заверен достаточным количеством доверяемых подписей!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Нет уверенности в том, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: пропущено: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: пропущено: открытый ключ уже имеется\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Не задан User ID. (можете использовать \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr "Текущие получатели:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5432,42 +5492,42 @@ msgstr ""
 "\n"
 "Введите User ID.  Пустая строка для завершения: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Нет такого User ID.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Открытый ключ отключен.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "пропущено: открытый ключ уже установлен\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "неизвестный получатель по умолчанию \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: пропущено: открытый ключ отключен\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "нет действительных адресов\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "ключ %s не имеет User ID\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "ключ %s не имеет User ID\n"
@@ -5476,27 +5536,32 @@ msgstr "ключ %s не имеет User ID\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Отделенная подпись.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Введите имя файла с данными: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "читаю stdin ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "не подписанные данные\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "не могу открыть подписанные данные `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5531,7 +5596,7 @@ msgid "NOTE: key has been revoked"
 msgstr "ЗАМЕЧАНИЕ: ключ был отозван"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr ""
@@ -5553,11 +5618,11 @@ msgstr "(Это - sensitive ключ отзыва)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "Для вывода использован ASCII формат.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr ""
@@ -5571,33 +5636,33 @@ msgstr "Сертификат отзыва создан.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "ключи отзыва для \"%s\" не найдены\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "секретный ключ \"%s\" не найден: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "нет соотвествующего открытого ключа: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "открытый ключ не соотвествует секретному!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "неизвестный алгоритм защиты\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "ЗАМЕЧАНИЕ: Данный ключ не защищен!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5616,33 +5681,33 @@ msgstr ""
 "носитель будет поврежден, но будьте осторожны: система печати\n"
 "может сохранить данные и сделать их доступными для других!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Укажите причину отзыва:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Отмена"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Возможно Вы хотите выбрать здесь %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Введите необязательное пояснение; закончите пустой строкой:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Причина отзыва: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(Пояснения отсутствуют)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr "Все правильно? (y/N) "
 
@@ -5814,11 +5879,11 @@ msgstr "сбой проверки созданной подписи: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только отделенная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5826,15 +5891,15 @@ msgstr ""
 "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только прозрачная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
@@ -6215,7 +6280,7 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "невозможно обновить запись о версии таблицы доверий: ошибка записи: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6225,11 +6290,16 @@ msgstr ""
 "Файл подписи (.sig или .asc) должен быть\n"
 "первым из файлов в командной строке.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "входная строка %u слишком длинная или пропущен LF\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "не могу открыть `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6293,52 +6363,61 @@ msgstr "сбой сохранения даты создания: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "сбой чтения открытого ключа: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "||Введите PIN%%0A[подписей: %lu]"
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Введите PIN%%0A[подписей: %lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6347,109 +6426,108 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr "|A|Административный PID"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr "пропущен штамп создания создания\n"
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карта не поддерживает функцию хеширования %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Введите PIN%%0A[подписей: %lu]"
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещена этой командой\n"
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
@@ -6513,7 +6591,7 @@ msgstr "обработчик fd %d запущен\n"
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d остановлен\n"
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "недопустимый символ radix64 %02X пропущен\n"
@@ -6536,132 +6614,132 @@ msgstr "протокол dirmngr версии %d не поддерживаетс
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "не могу подсоединиться к dirmngr - пытаемся откатиться назад\n"
 
-#: sm/certchain.c:159
+#: sm/certchain.c:165
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "критичное дополнение сертификата %s не поддерживается"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr "издатель сертификата не помечен как CA"
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr "помеченная критичной политика без настроенных политик"
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr "замечание: не критичные политики сертификана не позволяются"
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 msgid "certificate policy not allowed"
 msgstr "политика сертификата не дозволена"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "число совпавших издателей: %d\n"
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 msgid "failed to allocated keyDB handle\n"
 msgstr ""
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 msgid "certificate has been revoked"
 msgstr "сертификат был отозван"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 msgid "no CRL found for certificate"
 msgstr "не найдена CRL для сертификата"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 msgid "the available CRL is too old"
 msgstr "достпуная CRL слишком стара"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "проверьте, что \"dirmngr\" установлен корректно\n"
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "сбой проверки CRL: %s"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 msgid "no issuer found in certificate"
 msgstr "не найден издатель в сертификате"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "сертификат недостоверный: %s"
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr "сертификат еще не достоверен"
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 msgid "certificate has expired"
 msgstr "сертификат просрочен"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr "самоподписанный\tсертификат имеет ПЛОХУЮ подпись"
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr "корневой сертификат не помечен доверяемым"
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "отпечаток=%s\n"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr "корневой сертификат теперь помечен доверяемым\n"
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "в gpg-agent нельзя сделать сертификат доверяемым интерактивно\n"
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "для данной сессии запрещено делать сертификат доверяемым интерактивно\n"
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "сбой проверки списка доверий: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "цепочка сертификации слишком длинная\n"
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr "не найден издатель сертификата"
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 msgid "certificate has a BAD signature"
 msgstr "сертификат имеет ПЛОХУЮ подпись"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr "найдено еще одно соответствие CA  сертификата - повторная попытки"
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "цепочка сертификации длиннее дозволенной CA (%d)"
@@ -6820,7 +6898,7 @@ msgstr "сертификат `%s' удален\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "удаление сертификата \"%s\" неудачно: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 msgid "no valid recipients given\n"
 msgstr "не заданы получатели\n"
 
@@ -6866,10 +6944,6 @@ msgstr "экспорт сертификатов"
 msgid "register a smartcard"
 msgstr "зарегистрировать смарткарту"
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr "запуск в режиме сервера"
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr "передать команду dirmngr"
@@ -7022,29 +7096,39 @@ msgstr "использование: gpgsm [параметры] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "не могу зашифровать для `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr "libksba слишком устаревшая (требуется %s, имеется %s)\n"
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "невозможно подписать используя `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr "данная команды всё еще не реализована\n"
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent недоступен в данной сессии\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Выберите тип создаваемого ключа:\n"
+
 #: sm/import.c:110
 #, c-format
 msgid "total number processed: %lu\n"
diff --git a/po/sk.po b/po/sk.po
index 6d8f64a08..d096230a7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -31,36 +31,41 @@ msgid ""
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve mene\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nespr�vne MPI"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nespr�vne heslo"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "nespr�vne heslo"
@@ -70,21 +75,21 @@ msgstr "nespr�vne heslo"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -155,29 +160,50 @@ msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Pou�i� napriek tomu tento k���? "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Vlo�i� heslo\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -188,104 +214,104 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, 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:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
@@ -294,148 +320,148 @@ msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, 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:1373
+#: agent/gpg-agent.c:1379
 #, 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:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, 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:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -463,40 +489,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nespr�vne heslo"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Zru�i�"
@@ -655,12 +681,12 @@ msgstr "probl�m v komunik�cii s gpg-agentom\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
@@ -726,77 +752,77 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII k�dovanie: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dovania: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �itate�nom form�te\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "vnoren� podpisy v �itate�nom form�tu\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neo�ak�van� k�dovanie ASCII:"
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "nespr�vne ozna�enie riadku m�nusmi: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "pred�asn� koniec s�boru (v CRC)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "nespr�vny form�t CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "chyba v p�ti�ke\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -850,8 +876,8 @@ msgstr "tajn� k��� nie je dostupn�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
@@ -925,7 +951,7 @@ msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -1037,7 +1063,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
@@ -1061,7 +1087,7 @@ msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
@@ -1070,7 +1096,7 @@ msgstr "ukon�i� toto menu"
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
@@ -1127,7 +1153,7 @@ msgstr ""
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Pr�kaz> "
 
@@ -1146,27 +1172,27 @@ msgstr "konfliktn� pr�kazy\n"
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
@@ -1208,52 +1234,52 @@ msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v m�de S2K nemo�no pou�i� symetrick� ESK paket\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "pou�it� �ifra %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete �ifrova� len RSA k���om s d�kou 2048 bitov a menej\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "��tam z `%s'\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "algoritmus IDEA nemo�no pou�i� na v�etky k���e, pre ktor� �ifrujete.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1261,40 +1287,40 @@ msgid ""
 msgstr ""
 "vy�iadan� kompresn� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pre: %s\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� d�ta\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VAROVANIE: spr�va bola za�ifrovan� slab�m k���om v symetrickej �ifre.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m so za�ifrovan�m paketom\n"
 
@@ -1387,41 +1413,41 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "k��� %08lX: PGP 2.x k��� - presko�en�\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROVANIE: tajn� k��� %08lX nem� jednoduch� SK kontroln� s��et\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
@@ -1447,7 +1473,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
@@ -1462,7 +1488,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1470,128 +1496,132 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1602,51 +1632,51 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 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:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1655,7 +1685,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1675,17 +1705,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1695,7 +1725,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1703,562 +1733,562 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, 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:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, 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:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, 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:2224
+#: g10/gpg.c:2262
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
 "bezpe�ne\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 #, 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:2507
+#: g10/gpg.c:2546
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 #, 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 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:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -2643,426 +2673,426 @@ msgstr "nepou�ite�n� tajn� k���"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d bol presko�en�\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu k���e boli doteraz spracovan�\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkovo spracovan�ch k���ov: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      presko�en� nov� k���e: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        bez identifik�torov: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importovan�: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  bez zmien: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� id u��vate�ov: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              nov� podk���e: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      nov� revok�cie k���ov: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importovan� tajn� k���e: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      tajn� k���e nezmenen�: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportovan�: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
 
 # c-format
-#: g10/import.c:763
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em n�js� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em ��ta� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "k��� %08lX: je u� v s�bore tajn�ch k���ov\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "k��� %08lX: nebol n�jden� tajn� k���: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "k��� %08lX: ch�ba verejn� k��� - nem��em aplikova� revoka�n� certifik�t\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
 "\"\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
 "08lX\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
@@ -3172,12 +3202,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
@@ -3391,8 +3421,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -3401,20 +3431,20 @@ msgstr "podpisovanie zlyhalo: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
@@ -3431,11 +3461,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3443,206 +3473,206 @@ msgstr ""
 "Nechcete heslo - to je *zl�* n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 #, fuzzy
 msgid "check signatures"
 msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "enable key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 #, fuzzy
 msgid "disable key"
 msgstr "nastavi� k��� ako neplatn� (disable)"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Tajn� k��� je dostupn�.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3650,241 +3680,241 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "K��� revokovan�."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�ma trieda podpisu"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr "Not�cie: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3892,19 +3922,19 @@ msgstr ""
 "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3912,7 +3942,7 @@ msgstr ""
 "VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
 "sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3921,55 +3951,75 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3978,196 +4028,196 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROVANIE: ozna�enie k���a ako revokovac� u� nem��e by� zru�en�!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstr��te v�ber z tajn�ch k���ov.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podp�san� %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4211,12 +4261,12 @@ msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
@@ -4520,7 +4570,7 @@ msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4528,12 +4578,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4545,7 +4595,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4557,50 +4607,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4609,12 +4659,12 @@ msgstr ""
 "Tento k��� nem��e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
 "sekund�rneho k���a na tento ��el m��ete pou�i� pr�kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4622,7 +4672,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4630,26 +4680,26 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
@@ -4795,7 +4845,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� parameter pre export\n"
@@ -4830,318 +4880,318 @@ msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 msgid "searching for names from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "zvl�tna ve�kos� �ifrovacieho k���a pre sedenie (%d)\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s k��� �ifrovan�ho sedenia\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejn� k��� je %08lX\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "za�ifrovan� %u-bitov�m %s k���om, ID %08lX, vytvoren�m %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrovan� %s k���om, ID %08lX\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrovan� s %lu heslami\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrovan� jedn�m heslom\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nie je dostupn�; optimisticky sa ho pok�sime nahradi� "
 "algoritmom %s\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "de�ifrovanie o.k.\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� meno s�boru='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ite \"gpg --import\", ak ho chcete "
 "vyu�i�\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvoren� %.*s pomocou %s k���a ID %08lX\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROVANIE: N�jden� viacn�sobne podpisy. Skontrolovan� bude len prv�.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
@@ -5176,56 +5226,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pre GnuPG nen�jden�\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = pros�m o viac inform�c�i\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
@@ -5283,7 +5343,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
@@ -5311,12 +5371,12 @@ msgstr "Vlo�i� heslo\n"
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5326,12 +5386,12 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -5383,23 +5443,23 @@ msgstr "Je t�to fotografia spr�vna (a/N/u)? "
 msgid "unable to display photo ID!\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "K��� je nahraden�"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "K��� bol skompromitovan�"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "K��� sa u� nepou��va"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u��vate�a u� neplat�"
 
@@ -5470,7 +5530,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Va�e rozhodnutie? "
 
@@ -5516,111 +5576,111 @@ msgstr ""
 "odpoveda� �no\n"
 "\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 #, fuzzy
 msgid "Use this key anyway? (y/N) "
 msgstr "Pou�i� napriek tomu tento k���? "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROVANIE: Je pou�it� ned�veryhodn� k���!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VAROVANIE: k��� m��e by� revokovan� (revoka�n� k��� neexistuje)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho vlastn�kom!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 #, fuzzy
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamena�, �e podpis je falo�n�.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento podk��� bol revokovan� jeho vlastn�kom!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento k��� bol ozna�en� ako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnos� tohto k���a!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROVANIE: Tento k��� nie certifikovan� d�veryhodn�m podpisom!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROVANIE: NEd�verujeme tomuto k���u!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravdepodobne FALO�N�.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROVANIE: Tento k��� nie je certifikovan� dostato�ne d�veryhodn�mi "
 "podpismi!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nie je ist�, �e tento podpis patr� vlastn�kovi.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: presko�en�: verejn� k��� je u� obsiahnut� v datab�ze\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Ne�pecifikovali ste identifik�tor u��vate�a (user ID). M��ete pou�i� \"-r\"\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5628,42 +5688,42 @@ msgstr ""
 "\n"
 "Nap��te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven� pod�a implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Verejn� k��� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "�iadne platn� adresy\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
@@ -5672,27 +5732,32 @@ msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "d�ta neboli ulo�en�; na ich ulo�enie pou�ite prep�na� \"--output\"\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Podpis oddelen� od dokumentu.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "��tam �tandardn� vstup (stdin) ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "ch�baj� podp�san� d�ta\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, fuzzy, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5726,7 +5791,7 @@ msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet zlyhala: %s\n"
@@ -5749,11 +5814,11 @@ msgstr "(Toto je citliv� revoka�n� k���)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "Vyn�ten� ASCII textov� v�stup.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet zlyhala: %s\n"
@@ -5767,34 +5832,34 @@ msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento k��� nie je chr�nen�!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5812,33 +5877,33 @@ msgstr ""
 "Ale hroz� nebezpe�enstvo: Tla�ov� syst�m V�ho po��ta�a m��e uklada� d�ta a\n"
 "spr�stupni� ich in�m!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Zru�i�"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ak chcete, nap��te popis; ukon�ite pr�zdnym riadkom:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod na revok�ciu: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(�iadny popis)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Je to v poriadku? "
@@ -6013,29 +6078,29 @@ msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytvori� len oddelen� podpis k���a vo form�te PGP-2.x\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
 "x\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
@@ -6424,7 +6489,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6434,11 +6499,16 @@ msgstr ""
 "Pros�m, nezab�dajte, �e s�bor s podpisom (.sig alebo .asc)\n"
 "by mal by� prv�m s�borom zadan�m na pr�kazovom riadku.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "vstupn� riadok %u je pr�li� dlh� alebo na konci ch�ba znak LF\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "nem��em otvori� `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6504,52 +6574,61 @@ msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr ""
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6557,113 +6636,112 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr ""
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
@@ -6730,7 +6808,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
@@ -6754,139 +6832,139 @@ 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:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "nespr�vny certifik�t"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "K��� k dispoz�cii na: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "vyp�sa� fingerprint"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikova� podpis"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -7049,7 +7127,7 @@ msgstr "duplicita predvo�by %c%lu\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(�iadny popis)\n"
@@ -7103,10 +7181,6 @@ msgstr "nespr�vny certifik�t"
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7269,29 +7343,39 @@ msgstr "pou�itie: gpg [mo�nosti] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
@@ -8092,18 +8176,6 @@ msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 #~ msgstr "nemo�no spusti� %s \"%s\": %s\n"
 
 #, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "U��vate�sk� ID \"%s\" je revokovan�."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "U��vate�sk� ID \"%s\" je revokovan�."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "U��vate�sk� ID \"%s\" je revokovan�."
-
-#, fuzzy
 #~ msgid "No user IDs are removable.\n"
 #~ msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
diff --git a/po/sv.po b/po/sv.po
index 8624b1323..8f7acaafd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-10 00:40+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2006-12-11 16:41+0100\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -32,197 +32,195 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../agent/call-pinentry.c:193
+#: agent/call-pinentry.c:193
 #, c-format
 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:390
-msgid "Please enter your PIN, so that the secret key can be unlocked for this session"
-msgstr "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här sessionen"
+#: agent/call-pinentry.c:390
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+"Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
+"sessionen"
 
-#: ../agent/call-pinentry.c:393
-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:393
+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:458
-#: ../agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: ../agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: ../agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: ../agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: ../agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: ../agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: ../agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 msgid "Passphrase"
 msgstr "Lösenfras"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: ../agent/command-ssh.c:533
+#: agent/command-ssh.c:533
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
-#: ../agent/command-ssh.c:692
-#: ../g10/exec.c:480
-#: ../g10/gpg.c:1016
-#: ../g10/keygen.c:3047
-#: ../g10/keygen.c:3077
-#: ../g10/keyring.c:1204
-#: ../g10/keyring.c:1508
-#: ../g10/openfile.c:265
-#: ../g10/openfile.c:358
-#: ../g10/sign.c:830
-#: ../g10/sign.c:1136
-#: ../g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: ../agent/command-ssh.c:704
-#: ../g10/card-util.c:679
-#: ../g10/card-util.c:748
-#: ../g10/dearmor.c:62
-#: ../g10/dearmor.c:111
-#: ../g10/decrypt.c:70
-#: ../g10/encode.c:196
-#: ../g10/encode.c:488
-#: ../g10/gpg.c:1017
-#: ../g10/import.c:195
-#: ../g10/keygen.c:2555
-#: ../g10/keyring.c:1534
-#: ../g10/openfile.c:188
-#: ../g10/openfile.c:343
-#: ../g10/plaintext.c:491
-#: ../g10/sign.c:812
-#: ../g10/sign.c:1007
-#: ../g10/sign.c:1120
-#: ../g10/sign.c:1272
-#: ../g10/tdbdump.c:141
-#: ../g10/tdbdump.c:149
-#: ../g10/tdbio.c:542
-#: ../g10/tdbio.c:605
-#: ../g10/verify.c:102
-#: ../g10/verify.c:158
-#: ../sm/gpgsm.c:1771
-#: ../sm/gpgsm.c:1808
-#: ../sm/qualified.c:74
+#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
+#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: ../agent/command-ssh.c:1619
-#: ../agent/command-ssh.c:1637
+#: agent/command-ssh.c:1619 agent/command-ssh.c:1637
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "fel vid hämtning av serienummer på kort: %s\n"
 
-#: ../agent/command-ssh.c:1623
+#: agent/command-ssh.c:1623
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "identifierade kort med serienummer: %s\n"
 
-#: ../agent/command-ssh.c:1628
+#: agent/command-ssh.c:1628
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "fel vid hämtning av nyckel-id för autentisering på kort: %s\n"
 
-#: ../agent/command-ssh.c:1648
+#: agent/command-ssh.c:1648
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "ingen lämplig kortnyckel hittades: %s\n"
 
-#: ../agent/command-ssh.c:1698
+#: agent/command-ssh.c:1698
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "skuggning av nyckeln misslyckades: %s\n"
 
-#: ../agent/command-ssh.c:1713
+#: agent/command-ssh.c:1713
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "fel vid skrivning av nyckel: %s\n"
 
-#: ../agent/command-ssh.c:2018
+#: agent/command-ssh.c:2018
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Ange lösenfrasen för ssh-nyckeln%0A  %c"
 
-#: ../agent/command-ssh.c:2353
+#: agent/command-ssh.c:2353
 #, c-format
-msgid "Please enter a passphrase to protect the received secret key%%0A   %s%%0Awithin gpg-agent's key storage"
-msgstr "Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  gpg-agents nyckellager"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
+msgstr ""
+"Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  "
+"gpg-agents nyckellager"
 
-#: ../agent/command-ssh.c:2853
+#: agent/command-ssh.c:2853
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
 
-#: ../agent/divert-scd.c:219
+#: agent/divert-scd.c:219
 msgid "Admin PIN"
 msgstr "Admin PIN-kod"
 
-#: ../agent/divert-scd.c:277
+#: agent/divert-scd.c:277
 msgid "Repeat this PIN"
 msgstr "Upprepa denna PIN-kod"
 
-#: ../agent/divert-scd.c:280
+#: agent/divert-scd.c:280
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-kod repeterades inte korrekt; försök igen"
 
-#: ../agent/divert-scd.c:292
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
 
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Vill du använda nyckeln ändå? (j/N) "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Ange lösenfrasen\n"
+
 # fel kapitalisering i originalet?
-#: ../agent/genkey.c:109
+#: agent/genkey.c:146
 #, 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:111
-#: ../agent/genkey.c:219
-#: ../agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
-#. The re-entered one did not match and the user did not
-#. hit cancel.
-#: ../agent/genkey.c:132
-#: ../agent/genkey.c:239
-#: ../agent/protect-tool.c:1221
-#: ../tools/symcryptrun.c:487
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
+#: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
-#: ../agent/genkey.c:218
+#: agent/genkey.c:265
 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:74
-#: ../agent/protect-tool.c:109
-#: ../scd/scdaemon.c:103
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: scd/scdaemon.c:103
 msgid ""
 "@Options:\n"
 " "
@@ -230,136 +228,110 @@ msgstr ""
 "@Flaggor:\n"
 " "
 
-#: ../agent/gpg-agent.c:113
-#: ../scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: ../agent/gpg-agent.c:114
-#: ../scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#. { oArmor, "armor",     0, N_("create ascii armored output")},
-#. { oArmor, "armour",     0, "@" },
-#. { oOutput, "output",    2, N_("use as output file")},
-#: ../agent/gpg-agent.c:115
-#: ../g10/gpg.c:465
-#: ../g10/gpgv.c:71
-#: ../kbx/kbxutil.c:82
-#: ../scd/scdaemon.c:109
-#: ../sm/gpgsm.c:335
-#: ../tools/gpg-connect-agent.c:59
-#: ../tools/gpgconf.c:63
-#: ../tools/symcryptrun.c:185
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "utförlig"
 
-#: ../agent/gpg-agent.c:116
-#: ../g10/gpgv.c:72
-#: ../kbx/kbxutil.c:83
-#: ../scd/scdaemon.c:110
-#: ../sm/gpgsm.c:336
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: ../agent/gpg-agent.c:117
-#: ../scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: ../agent/gpg-agent.c:118
-#: ../scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: ../agent/gpg-agent.c:119
-#: ../tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: ../agent/gpg-agent.c:124
-#: ../scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122
-#: ../sm/gpgsm.c:338
-#: ../tools/symcryptrun.c:187
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
+#: tools/symcryptrun.c:187
 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: 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:154
+#: 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:156
+#: agent/gpg-agent.c:158
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: ../agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr "aktivera ssh-agent-emulering"
 
-#: ../agent/gpg-agent.c:159
+#: 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:241
-#: ../agent/preset-passphrase.c:96
-#: ../agent/protect-tool.c:143
-#: ../scd/scdaemon.c:190
-#: ../sm/gpgsm.c:517
-#: ../tools/gpg-connect-agent.c:123
-#: ../tools/gpgconf.c:86
-#: ../tools/symcryptrun.c:225
-#: ../scd/sc-copykeys.c:81
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: tools/gpgconf.c:86 tools/symcryptrun.c:225
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
-#: ../agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
 
-#: ../agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -367,189 +339,148 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: ../agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr "slut på kärna i säkert minne vid allokering av %lu byte"
 
-#: ../agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr "slut på kärna vid allokering av %lu byte"
 
-#: ../agent/gpg-agent.c:339
-#: ../g10/gpg.c:923
-#: ../scd/scdaemon.c:264
-#: ../sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: ../agent/gpg-agent.c:510
-#: ../agent/protect-tool.c:1073
-#: ../g10/gpg.c:1808
-#: ../kbx/kbxutil.c:432
-#: ../scd/scdaemon.c:356
-#: ../sm/gpgsm.c:767
-#: ../tools/symcryptrun.c:1056
-#: ../scd/sc-copykeys.c:134
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
+#: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt är för gammal (behöver %s, har %s)\n"
 
-#: ../agent/gpg-agent.c:604
-#: ../g10/gpg.c:2007
-#: ../scd/scdaemon.c:433
-#: ../sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: ../agent/gpg-agent.c:609
-#: ../agent/gpg-agent.c:1160
-#: ../g10/gpg.c:2011
-#: ../scd/scdaemon.c:438
-#: ../sm/gpgsm.c:868
-#: ../tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: ../agent/gpg-agent.c:617
-#: ../g10/gpg.c:2018
-#: ../scd/scdaemon.c:446
-#: ../sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: ../agent/gpg-agent.c:930
-#: ../g10/plaintext.c:136
-#: ../g10/plaintext.c:141
-#: ../g10/plaintext.c:158
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
+#: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel vid skapande av \"%s\": %s\n"
 
-#: ../agent/gpg-agent.c:1210
-#: ../agent/gpg-agent.c:1313
-#: ../agent/gpg-agent.c:1317
-#: ../agent/gpg-agent.c:1353
-#: ../agent/gpg-agent.c:1357
-#: ../g10/exec.c:174
-#: ../g10/openfile.c:416
-#: ../scd/scdaemon.c:932
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
+#: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: ../agent/gpg-agent.c:1224
-#: ../scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: ../agent/gpg-agent.c:1250
-#: ../scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: ../agent/gpg-agent.c:1279
-#: ../scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fel vid bindning av uttag till \"%s\": %s\n"
 
-#: ../agent/gpg-agent.c:1287
-#: ../scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: ../agent/gpg-agent.c:1293
-#: ../scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: ../agent/gpg-agent.c:1321
-#: ../agent/gpg-agent.c:1363
-#: ../g10/openfile.c:419
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: ../agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: ../agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: ../agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, 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:1480
+#: agent/gpg-agent.c:1486
 #, 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:1497
+#: agent/gpg-agent.c:1503
 #, 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:1502
+#: agent/gpg-agent.c:1508
 #, 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:1598
-#: ../scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: ../agent/gpg-agent.c:1704
-#: ../scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#. Okay, its running on the standard socket.
-#: ../agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#. Okay, its running on the standard socket.
-#: ../agent/gpg-agent.c:1735
-#: ../common/simple-pwquery.c:324
-#: ../g10/call-agent.c:137
-#: ../sm/call-agent.c:144
-#: ../tools/gpg-connect-agent.c:713
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: ../agent/gpg-agent.c:1747
-#: ../common/simple-pwquery.c:336
-#: ../g10/call-agent.c:149
-#: ../sm/call-agent.c:156
-#: ../tools/gpg-connect-agent.c:724
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
 
 # KEYGRIP är ett hexadecimalt värde som representerar hashen för den publika nyckeln
-#: ../agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:100
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
-msgstr "Användning: gpg-preset-passphrase [flaggor] NYCKELHASH (-h för hjälp)\n"
+msgstr ""
+"Användning: gpg-preset-passphrase [flaggor] NYCKELHASH (-h för hjälp)\n"
 
-#: ../agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:103
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -557,11 +488,11 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
 "Underhåll av lösenordscache\n"
 
-#: ../agent/protect-tool.c:146
+#: agent/protect-tool.c:146
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Användning: gpg-protect-tool [flaggor] (-h för hjälp)\n"
 
-#: ../agent/protect-tool.c:148
+#: agent/protect-tool.c:148
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -569,19 +500,22 @@ msgstr ""
 "Syntax: gpg-protect-tool [flaggor] [argument]\n"
 "Underhållsverktyg för hemliga nycklar\n"
 
-#: ../agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
 
-#: ../agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: ../agent/protect-tool.c:1212
-msgid "Please enter the passphrase to protect the imported object within the GnuPG system."
-msgstr "Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
+#: agent/protect-tool.c:1213
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+msgstr ""
+"Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
 
-#: ../agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -589,65 +523,55 @@ msgstr ""
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-#: ../agent/protect-tool.c:1222
-#: ../tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: ../agent/protect-tool.c:1235
-#: ../tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fel vid fråga efter lösenfrasen: %s\n"
 
-#: ../agent/protect-tool.c:1238
-#: ../tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
-#: ../agent/trustlist.c:115
-#: ../agent/trustlist.c:303
+#: agent/trustlist.c:115 agent/trustlist.c:303
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: ../agent/trustlist.c:130
+#: agent/trustlist.c:130
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fil \"%s\", rad %d: %s\n"
 
-#. Same file.
-#: ../agent/trustlist.c:150
-#: ../agent/trustlist.c:158
+#: agent/trustlist.c:150 agent/trustlist.c:158
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "uttrycket \"%s\" ignorerat i \"%s\", rad %d\n"
 
-#. A non existent system trustlist is not an error.
-#. Just print a note.
-#: ../agent/trustlist.c:164
+#: agent/trustlist.c:164
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "systemets tillitslista \"%s\" är inte tillgänglig\n"
 
-#: ../agent/trustlist.c:199
+#: agent/trustlist.c:199
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
 
-#: ../agent/trustlist.c:225
-#: ../agent/trustlist.c:232
+#: agent/trustlist.c:225 agent/trustlist.c:232
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: ../agent/trustlist.c:264
+#: agent/trustlist.c:264
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fel vid läsning av \"%s\", rad %d: %s\n"
 
-#: ../agent/trustlist.c:355
-#: ../agent/trustlist.c:394
+#: agent/trustlist.c:355 agent/trustlist.c:394
 msgid "error reading list of trusted root certificates\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 
@@ -660,15 +584,19 @@ 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:470
+#: agent/trustlist.c:470
 #, c-format
-msgid "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the fingerprint:%%0A  %s"
-msgstr "Validera att certifikatet identifierat som:%%0A  \"%s\"%%0Ahar fingeravtrycket:%%0A  %s"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
+msgstr ""
+"Validera att certifikatet identifierat som:%%0A  \"%s\"%%0Ahar "
+"fingeravtrycket:%%0A  %s"
 
 #. 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:479
+#: agent/trustlist.c:479
 msgid "Correct"
 msgstr "Korrekt"
 
@@ -680,456 +608,432 @@ 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:499
+#: agent/trustlist.c:499
 #, c-format
-msgid "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user certificates?"
-msgstr "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera användarcertifikat?"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
+"Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
+"användarcertifikat?"
 
-#: ../agent/trustlist.c:505
+#: agent/trustlist.c:505
 msgid "Yes"
 msgstr "Ja"
 
-#: ../agent/trustlist.c:505
+#: agent/trustlist.c:505
 msgid "No"
 msgstr "Nej"
 
-#: ../common/exechelp.c:285
-#: ../common/exechelp.c:376
+#: common/exechelp.c:285 common/exechelp.c:376
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fel vid skapandet av ett rör: %s\n"
 
 # se förra kommentaren
-#: ../common/exechelp.c:352
-#: ../common/exechelp.c:409
+#: common/exechelp.c:352 common/exechelp.c:409
 #, 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:388
-#: ../common/exechelp.c:546
+#: common/exechelp.c:388 common/exechelp.c:546
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
 
-#: ../common/exechelp.c:444
-#: ../common/exechelp.c:487
+#: common/exechelp.c:444 common/exechelp.c:487
 #, 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:452
+#: common/exechelp.c:452
 #, 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:458
-#: ../common/exechelp.c:498
+#: common/exechelp.c:458 common/exechelp.c:498
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: ../common/exechelp.c:493
+#: common/exechelp.c:493
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 
-#: ../common/exechelp.c:504
+#: common/exechelp.c:504
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
 
-#: ../common/http.c:1622
+#: common/http.c:1623
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "fel vid skapandet av uttag: %s\n"
 
-#: ../common/http.c:1666
+#: common/http.c:1667
 msgid "host not found"
 msgstr "värden hittades inte"
 
-#: ../common/simple-pwquery.c:310
+#: common/simple-pwquery.c:310
 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:368
+#: common/simple-pwquery.c:368
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: ../common/simple-pwquery.c:379
+#: common/simple-pwquery.c:379
 msgid "communication problem with gpg-agent\n"
 msgstr "kommunikationsproblem med gpg-agent\n"
 
-#: ../common/simple-pwquery.c:389
+#: common/simple-pwquery.c:389
 msgid "problem setting the gpg-agent options\n"
 msgstr "inställningsproblem för gpg-agent\n"
 
-#: ../common/simple-pwquery.c:527
-#: ../common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 msgid "canceled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: ../common/simple-pwquery.c:534
-#: ../common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 msgid "problem with the agent\n"
 msgstr "problem med agenten\n"
 
-#: ../common/sysutils.c:88
-#: ../g10/misc.c:137
+#: common/sysutils.c:88 g10/misc.c:137
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
-#: ../common/sysutils.c:183
+#: common/sysutils.c:183
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Varning: osäkert ägarskap på %s \"%s\"\n"
 
 # Extension är vad? FIXME
-#: ../common/sysutils.c:215
+#: common/sysutils.c:215
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../common/yesno.c:33
-#: ../common/yesno.c:70
+#: common/yesno.c:33 common/yesno.c:70
 msgid "yes"
 msgstr "ja"
 
-#: ../common/yesno.c:34
-#: ../common/yesno.c:75
+#: common/yesno.c:34 common/yesno.c:75
 msgid "yY"
 msgstr "jJ"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../common/yesno.c:36
-#: ../common/yesno.c:72
+#: common/yesno.c:36 common/yesno.c:72
 msgid "no"
 msgstr "nej"
 
-#: ../common/yesno.c:37
-#: ../common/yesno.c:76
+#: common/yesno.c:37 common/yesno.c:76
 msgid "nN"
 msgstr "nN"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../common/yesno.c:74
+#: common/yesno.c:74
 msgid "quit"
 msgstr "avsluta"
 
-#: ../common/yesno.c:77
+#: common/yesno.c:77
 msgid "qQ"
 msgstr "aA"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../common/yesno.c:111
+#: common/yesno.c:111
 msgid "okay|okay"
 msgstr "okay|okej|ok"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../common/yesno.c:113
+#: common/yesno.c:113
 msgid "cancel|cancel"
 msgstr "avbryt|stoppa"
 
-#: ../common/yesno.c:114
+#: common/yesno.c:114
 msgid "oO"
 msgstr "oO"
 
-#: ../common/yesno.c:115
+#: common/yesno.c:115
 msgid "cC"
 msgstr "cC"
 
-#: ../g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-skal: %s\n"
 
-#: ../g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "ogiltig rubrikrad i ASCII-skalet: "
 
-#: ../g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "rad i ASCII-skalet: "
 
-#: ../g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "ogiltig rubrikrad i klartextsignatur\n"
 
-#: ../g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer går in i varandra\n"
 
-#: ../g10/armor.c:568
+#: g10/armor.c:616
 msgid "unexpected armor: "
 msgstr "oväntat skal: "
 
 # rader i klartexten som inleds med bindestreck får ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..."
-#. Bad dash-escaping.
-#: ../g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "ogiltig rad som börjar med bindestreck: "
 
 # överhoppad eller hoppades över?
-#: ../g10/armor.c:734
-#: ../g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ogiltigt radix64-tecken %02X hoppades över\n"
 
 # CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
-#: ../g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
 
-#: ../g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "för tidigt filslut (i CRC-summan)\n"
 
-#: ../g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: ../g10/armor.c:823
-#: ../g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-fel; %06lX - %06lX\n"
 
-#: ../g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr "för tidigt filslut (i den avslutande raden)\n"
 
-#: ../g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: ../g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: ../g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ogiltigt ASCII-skal: raden är längre än %d tecken\n"
 
-#: ../g10/armor.c:1167
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+#: g10/armor.c:1215
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
-"tecken kodade enligt \"quoted printable\"-standarden hittades i skalet - detta\n"
-"beror sannolikt på att en felaktig e-postserver eller e-postklient har använts\n"
+"tecken kodade enligt \"quoted printable\"-standarden hittades i skalet - "
+"detta\n"
+"beror sannolikt på att en felaktig e-postserver eller e-postklient har "
+"använts\n"
 
-#: ../g10/build-packet.c:978
-msgid "a notation name must have only printable characters or spaces, and end with an '='\n"
-msgstr "ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och sluta med ett \"'=\"\n"
+#: g10/build-packet.c:978
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
+"sluta med ett \"'=\"\n"
 
-#: ../g10/build-packet.c:990
+#: g10/build-packet.c:990
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en användares notationsnamn måste innehåller tecknet \"@\"\n"
 
-#: ../g10/build-packet.c:996
+#: g10/build-packet.c:996
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "ett notationsnamn får inte innehålla fler än ett \"'@\"-tecken\n"
 
-#: ../g10/build-packet.c:1014
+#: g10/build-packet.c:1014
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte använda några styrtecken\n"
 
-#: ../g10/build-packet.c:1048
-#: ../g10/build-packet.c:1057
+#: g10/build-packet.c:1048 g10/build-packet.c:1057
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: ../g10/build-packet.c:1079
-#: ../g10/build-packet.c:1081
+#: g10/build-packet.c:1079 g10/build-packet.c:1081
 msgid "not human readable"
 msgstr "inte läsbart"
 
-#: ../g10/call-agent.c:99
-#: ../sm/call-agent.c:102
+#: g10/call-agent.c:99 sm/call-agent.c:102
 msgid "no running gpg-agent - starting one\n"
 msgstr "ingen körande gpg-agent - startar en\n"
 
-#: ../g10/call-agent.c:160
-#: ../sm/call-agent.c:167
+#: g10/call-agent.c:160 sm/call-agent.c:167
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "kan inte ansluta till agenten - försöker falla tillbaka\n"
 
-#: ../g10/card-util.c:64
-#: ../g10/card-util.c:307
+#: g10/card-util.c:64 g10/card-util.c:307
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 
-#: ../g10/card-util.c:69
+#: g10/card-util.c:69
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#. We don't yet support unattended key generation.
-#: ../g10/card-util.c:77
-#: ../g10/card-util.c:1403
-#: ../g10/delkey.c:128
-#: ../g10/keyedit.c:1525
-#: ../g10/keygen.c:2739
-#: ../g10/revoke.c:218
-#: ../g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i satsläge\n"
 
-#: ../g10/card-util.c:104
-#: ../g10/card-util.c:1129
-#: ../g10/card-util.c:1212
-#: ../g10/keyedit.c:426
-#: ../g10/keyedit.c:447
-#: ../g10/keyedit.c:461
-#: ../g10/keygen.c:1550
-#: ../g10/keygen.c:1617
+#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
+#: g10/keyedit.c:426 g10/keyedit.c:447 g10/keyedit.c:461 g10/keygen.c:1550
+#: g10/keygen.c:1617
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: ../g10/card-util.c:217
-#: ../g10/card-util.c:267
+#: g10/card-util.c:217 g10/card-util.c:267
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: ../g10/card-util.c:414
+#: g10/card-util.c:414
 msgid "male"
 msgstr "man"
 
-#: ../g10/card-util.c:415
+#: g10/card-util.c:415
 msgid "female"
 msgstr "kvinna"
 
-#: ../g10/card-util.c:415
+#: g10/card-util.c:415
 msgid "unspecified"
 msgstr "ej angiven"
 
-#: ../g10/card-util.c:442
+#: g10/card-util.c:442
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: ../g10/card-util.c:442
+#: g10/card-util.c:442
 msgid "forced"
 msgstr "tvingad"
 
-#: ../g10/card-util.c:520
+#: g10/card-util.c:520
 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:522
+#: g10/card-util.c:522
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: ../g10/card-util.c:524
+#: g10/card-util.c:524
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: ../g10/card-util.c:541
+#: g10/card-util.c:541
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: ../g10/card-util.c:543
+#: g10/card-util.c:543
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: ../g10/card-util.c:561
+#: g10/card-util.c:561
 #, 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:582
+#: g10/card-util.c:582
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: ../g10/card-util.c:590
+#: g10/card-util.c:590
 #, 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:688
-#: ../g10/card-util.c:757
-#: ../g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: ../g10/card-util.c:696
+#: g10/card-util.c:696
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: ../g10/card-util.c:706
+#: g10/card-util.c:706
 #, 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:765
+#: g10/card-util.c:765
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: ../g10/card-util.c:775
+#: g10/card-util.c:775
 #, 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:795
+#: g10/card-util.c:795
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: ../g10/card-util.c:803
+#: g10/card-util.c:803
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: ../g10/card-util.c:812
+#: g10/card-util.c:812
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: ../g10/card-util.c:833
+#: g10/card-util.c:833
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
 
-#: ../g10/card-util.c:847
+#: g10/card-util.c:847
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: ../g10/card-util.c:868
+#: g10/card-util.c:868
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: ../g10/card-util.c:891
+#: g10/card-util.c:891
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: ../g10/card-util.c:939
+#: g10/card-util.c:939
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: ../g10/card-util.c:940
+#: g10/card-util.c:940
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: ../g10/card-util.c:949
+#: g10/card-util.c:949
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: ../g10/card-util.c:1034
+#: g10/card-util.c:1034
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: ../g10/card-util.c:1055
-#: ../g10/card-util.c:1064
+#: g10/card-util.c:1055 g10/card-util.c:1064
 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:1076
+#: g10/card-util.c:1076
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: ../g10/card-util.c:1085
+#: g10/card-util.c:1085
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1140,462 +1044,431 @@ msgstr ""
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: ../g10/card-util.c:1120
+#: g10/card-util.c:1120
 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:1122
-#: ../g10/card-util.c:1203
+#: g10/card-util.c:1122 g10/card-util.c:1203
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: ../g10/card-util.c:1123
-#: ../g10/card-util.c:1205
+#: g10/card-util.c:1123 g10/card-util.c:1205
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: ../g10/card-util.c:1124
-#: ../g10/card-util.c:1207
+#: g10/card-util.c:1124 g10/card-util.c:1207
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#. Okay.
-#: ../g10/card-util.c:1140
-#: ../g10/card-util.c:1223
-#: ../g10/keyedit.c:947
-#: ../g10/keygen.c:1554
-#: ../g10/keygen.c:1582
-#: ../g10/keygen.c:1656
-#: ../g10/revoke.c:685
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: ../g10/card-util.c:1200
+#: g10/card-util.c:1200
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: ../g10/card-util.c:1235
+#: g10/card-util.c:1235
 msgid "unknown key protection algorithm\n"
 msgstr "okänd nyckelskyddsalgoritm\n"
 
-#: ../g10/card-util.c:1240
+#: g10/card-util.c:1240
 msgid "secret parts of key are not available\n"
 msgstr "hemliga delar av nyckeln är inte tillgängliga.\n"
 
-#: ../g10/card-util.c:1245
+#: g10/card-util.c:1245
 msgid "secret key already stored on a card\n"
 msgstr "hemlig nyckel redan lagrad på ett kort\n"
 
-#: ../g10/card-util.c:1316
-#: ../g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: ../g10/card-util.c:1318
+#: g10/card-util.c:1318
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: ../g10/card-util.c:1319
-#: ../g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: ../g10/card-util.c:1321
+#: g10/card-util.c:1321
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: ../g10/card-util.c:1324
+#: g10/card-util.c:1324
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: ../g10/card-util.c:1325
+#: g10/card-util.c:1325
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: ../g10/card-util.c:1326
+#: g10/card-util.c:1326
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: ../g10/card-util.c:1327
+#: g10/card-util.c:1327
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: ../g10/card-util.c:1328
+#: g10/card-util.c:1328
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: ../g10/card-util.c:1329
+#: g10/card-util.c:1329
 msgid "change card holder's sex"
 msgstr "ändra kortinnehavarens kön"
 
-#: ../g10/card-util.c:1330
+#: g10/card-util.c:1330
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: ../g10/card-util.c:1331
+#: g10/card-util.c:1331
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: ../g10/card-util.c:1332
+#: g10/card-util.c:1332
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: ../g10/card-util.c:1333
+#: g10/card-util.c:1333
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: ../g10/card-util.c:1334
+#: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: ../g10/card-util.c:1454
-#: ../g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Kommando> "
 
-#: ../g10/card-util.c:1492
+#: g10/card-util.c:1492
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: ../g10/card-util.c:1523
+#: g10/card-util.c:1523
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: ../g10/card-util.c:1525
+#: g10/card-util.c:1525
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: ../g10/card-util.c:1599
-#: ../g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
-#: ../g10/decrypt.c:107
-#: ../g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 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:162
-#: ../g10/gpg.c:3820
-#: ../g10/keyring.c:378
-#: ../g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: ../g10/delkey.c:75
-#: ../g10/export.c:325
-#: ../g10/keyedit.c:3390
-#: ../g10/keyserver.c:1713
-#: ../g10/revoke.c:228
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
+#: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: ../g10/delkey.c:83
-#: ../g10/export.c:355
-#: ../g10/import.c:2348
-#: ../g10/keyserver.c:1727
-#: ../g10/revoke.c:234
-#: ../g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
 
-#: ../g10/delkey.c:129
-#: ../g10/delkey.c:136
+#: g10/delkey.c:129 g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
 
-#: ../g10/delkey.c:135
+#: g10/delkey.c:135
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "kan inte göra så i satsläge utan \"--yes\"\n"
 
-#: ../g10/delkey.c:147
+#: g10/delkey.c:147
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "Ta bort denna nyckel från nyckelringen? (j/N) "
 
-#: ../g10/delkey.c:155
+#: g10/delkey.c:155
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "Detta är en hemlig nyckel! - verkligen ta bort den? (j/N) "
 
-#: ../g10/delkey.c:165
+#: g10/delkey.c:165
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: ../g10/delkey.c:175
+#: g10/delkey.c:175
 msgid "ownertrust information cleared\n"
 msgstr "raderat information om ägartillit\n"
 
-#: ../g10/delkey.c:206
+#: g10/delkey.c:206
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "det finns en hemlig nyckel för denna publika nyckeln \"%s\"!\n"
 
-#: ../g10/delkey.c:208
+#: g10/delkey.c:208
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
 
-#: ../g10/encode.c:225
-#: ../g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenfras: %s\n"
 
-#: ../g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
 
-#: ../g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "använderchiffer %s\n"
 
-#: ../g10/encode.c:254
-#: ../g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" är redan komprimerad\n"
 
-#: ../g10/encode.c:305
-#: ../g10/encode.c:606
-#: ../g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
 
-#: ../g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "du kan endast kryptera till RSA-nycklar som är högst 2048 bitar långa i --pgp2-läge\n"
+msgstr ""
+"du kan endast kryptera till RSA-nycklar som är högst 2048 bitar långa i --"
+"pgp2-läge\n"
 
-#: ../g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: ../g10/encode.c:522
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:543
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kan inte använda IDEA-chiffer för alla nycklar du krypterar till.\n"
 
-#: ../g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
-msgid "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
+"mottagarinställningarna\n"
 
-#: ../g10/encode.c:650
-#: ../g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
-msgid "WARNING: forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot mottagarinställningarna\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+msgstr ""
+"VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
+"mottagarinställningarna\n"
 
-#: ../g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
+msgstr ""
+"tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
 
-#: ../g10/encode.c:814
-#: ../g10/pkclist.c:803
-#: ../g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: ../g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: ../g10/encr-data.c:70
-#: ../g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-krypterad data\n"
 
-#: ../g10/encr-data.c:72
-#: ../g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
 # I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
-#: ../g10/encr-data.c:110
-#: ../sm/decrypt.c:128
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+#: g10/encr-data.c:135 sm/decrypt.c:128
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel\n"
 "i den symmetriska krypteringen.\n"
 
-#: ../g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "problem vid hanteringen av krypterat paket\n"
 
-#: ../g10/exec.c:51
+#: g10/exec.c:51
 msgid "no remote program execution supported\n"
 msgstr "ingen körning av fjärrprogram stöds\n"
 
 # Behörighet att komma åt inställningarna, tror jag. Inte behörigheter i inställningsfilen.
-#: ../g10/exec.c:315
-msgid "external program calls are disabled due to unsafe options file permissions\n"
+#: g10/exec.c:315
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 "anrop av externa program är inaktiverat pga osäkra behörigheter för\n"
 "inställningsfilen\n"
 
-#: ../g10/exec.c:345
+#: g10/exec.c:345
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "denna plattform kräver temporärfiler vid anrop till externa program\n"
 
-#: ../g10/exec.c:423
+#: g10/exec.c:423
 #, c-format
 msgid "unable to execute program `%s': %s\n"
 msgstr "kunde inte köra programmet \"%s\": %s\n"
 
-#: ../g10/exec.c:426
+#: g10/exec.c:426
 #, c-format
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kunde inte köra skalet \"%s\": %s\n"
 
-#: ../g10/exec.c:511
+#: g10/exec.c:511
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "systemfel när externa program anropades: %s\n"
 
-#: ../g10/exec.c:522
-#: ../g10/exec.c:588
+#: g10/exec.c:522 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "externa program avslutades felaktigt\n"
 
-#: ../g10/exec.c:537
+#: g10/exec.c:537
 msgid "unable to execute external program\n"
 msgstr "Kunde inte köra det externa programmet\n"
 
-#: ../g10/exec.c:554
+#: g10/exec.c:554
 #, c-format
 msgid "unable to read external program response: %s\n"
 msgstr "kan inte läsa svaret från det externa programmet: %s\n"
 
-#: ../g10/exec.c:599
-#: ../g10/exec.c:606
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) \"%s\": %s\n"
 
-#: ../g10/exec.c:611
+#: g10/exec.c:611
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen \"%s\": %s\n"
 
-#: ../g10/export.c:63
+#: g10/export.c:63
 msgid "export signatures that are marked as local-only"
 msgstr "exportera signaturer som är märkta som local-only"
 
-#: ../g10/export.c:65
+#: g10/export.c:65
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "exportera attribut i användaridentiteter (vanligtvis foto-id)"
 
-#: ../g10/export.c:67
+#: g10/export.c:67
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "exportera spärrnycklar markerade som \"känslig\""
 
-#: ../g10/export.c:69
+#: g10/export.c:69
 msgid "remove the passphrase from exported subkeys"
 msgstr "ta bort lösenfrasen från exporterade undernycklar"
 
-#: ../g10/export.c:71
+#: g10/export.c:71
 msgid "remove unusable parts from key during export"
 msgstr "ta bort oanvändbara delar från nyckeln under exportering"
 
-#: ../g10/export.c:73
+#: g10/export.c:73
 msgid "remove as much as possible from key during export"
 msgstr "ta bort så mycket som möjligt från nyckeln under exportering"
 
-#: ../g10/export.c:75
+#: g10/export.c:75
 msgid "export keys in an S-expression based format"
 msgstr "exportera nycklar i ett S-uttrycksbaserat format"
 
-#: ../g10/export.c:339
+#: g10/export.c:340
 msgid "exporting secret keys not allowed\n"
 msgstr "exportering av hemliga nycklar tillåts inte\n"
 
-#: ../g10/export.c:368
+#: g10/export.c:369
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "nyckeln %s: inte skyddad - hoppade över\n"
 
-#: ../g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %s: nyckel av PGP 2.x-typ - hoppade över\n"
 
-#: ../g10/export.c:387
+#: g10/export.c:388
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
 
-#: ../g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr "på väg att exportera en oskyddad undernyckel\n"
 
-#: ../g10/export.c:561
+#: g10/export.c:562
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "misslyckades med att ta bort skydd på undernyckel: %s\n"
 
-#. I hope this warning doesn't confuse people.
-#: ../g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VARNING: hemliga nyckeln %s har ingen enkel SK-kontrollsumma\n"
 
-#: ../g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: ingenting exporterat\n"
 
-#: ../g10/getkey.c:153
+#: g10/getkey.c:153
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - inaktiverad\n"
 
-#: ../g10/getkey.c:176
+#: g10/getkey.c:176
 msgid "[User ID not found]"
 msgstr "[Användaridentitet hittades inte]"
 
-#: ../g10/getkey.c:953
-#: ../g10/getkey.c:963
-#: ../g10/getkey.c:973
-#: ../g10/getkey.c:989
-#: ../g10/getkey.c:1004
+#: g10/getkey.c:953 g10/getkey.c:963 g10/getkey.c:973 g10/getkey.c:989
+#: g10/getkey.c:1004
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "hämtade \"%s\" automatiskt via %s\n"
 
-#: ../g10/getkey.c:1831
+#: g10/getkey.c:1831
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
+msgstr ""
+"Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: ../g10/getkey.c:2385
-#: ../g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
 
-#: ../g10/getkey.c:2616
+#: g10/getkey.c:2616
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 
-#: ../g10/getkey.c:2663
+#: g10/getkey.c:2663
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: ../g10/gpg.c:365
-#: ../kbx/kbxutil.c:69
-#: ../sm/gpgsm.c:241
-#: ../tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1603,146 +1476,134 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: ../g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: ../g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: ../g10/gpg.c:369
-#: ../sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: ../g10/gpg.c:370
-#: ../sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: ../g10/gpg.c:372
-#: ../sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 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:374
-#: ../sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: ../g10/gpg.c:376
-#: ../sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: ../g10/gpg.c:378
-#: ../sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: ../g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: ../g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: ../g10/gpg.c:382
-#: ../sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: ../g10/gpg.c:383
-#: ../sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: ../g10/gpg.c:384
-#: ../sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: ../g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: ../g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: ../g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: ../g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: ../g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: ../g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: ../g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: ../g10/gpg.c:394
-#: ../sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: ../g10/gpg.c:395
-#: ../sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: ../g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: ../g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: ../g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: ../g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: ../g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: ../g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: ../g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: ../g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
+#: g10/gpg.c:429 sm/gpgsm.c:263
+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:428
-#: ../g10/gpgv.c:69
-#: ../kbx/kbxutil.c:77
-#: ../sm/gpgsm.c:278
-#: ../tools/gpg-connect-agent.c:57
-#: ../tools/gpgconf.c:60
-#: ../tools/symcryptrun.c:178
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
 "Options:\n"
@@ -1752,60 +1613,49 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: ../g10/gpg.c:430
-#: ../sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: ../g10/gpg.c:432
-#: ../sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: ../g10/gpg.c:443
-#: ../sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: ../g10/gpg.c:444
-#: ../sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 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:449
-#: ../sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: ../g10/gpg.c:463
-#: ../sm/gpgsm.c:334
-#: ../tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: ../g10/gpg.c:476
-#: ../kbx/kbxutil.c:84
-#: ../sm/gpgsm.c:344
-#: ../tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: ../g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
-#: ../g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr "använd strikt OpenPGP-beteende"
 
-#: ../g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 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:549
-#: ../sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1813,8 +1663,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: ../g10/gpg.c:552
-#: ../sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1834,19 +1683,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: ../g10/gpg.c:743
-#: ../g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera fel till <[email protected]>\n"
 "Skicka synpunkter på översättningen till <[email protected]>\n"
 
-#: ../g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: ../g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1856,8 +1704,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: ../g10/gpg.c:774
-#: ../sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1865,583 +1712,584 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: ../g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: ../g10/gpg.c:784
-#: ../g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: ../g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: ../g10/gpg.c:798
-#: ../g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: ../g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: ../g10/gpg.c:1052
-#: ../sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: ../g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: ../g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: ../g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
 
 # Extension är vad? FIXME
-#: ../g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
-msgstr "VARNING: osäkert att infoga katalogägarskapet för hemkatalogen \"%s\"\n"
+msgstr ""
+"VARNING: osäkert att infoga katalogägarskapet för hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
-msgid "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
-msgstr "VARNING: osäkert att infoga katalogägarskapet för konfigurationsfilen \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+msgstr ""
+"VARNING: osäkert att infoga katalogägarskapet för konfigurationsfilen \"%s"
+"\"\n"
 
-#: ../g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VARNING: osäkert att infoga katalogägarskapet för tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
-msgstr "VARNING: osäkert att infoga katalogrättigheter för hemkatalogen \"%s\"\n"
+msgstr ""
+"VARNING: osäkert att infoga katalogrättigheter för hemkatalogen \"%s\"\n"
 
-#: ../g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
-msgid "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
-msgstr "VARNING: osäkert att infoga katalogrättigheter för konfigurationsfilen \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
+msgstr ""
+"VARNING: osäkert att infoga katalogrättigheter för konfigurationsfilen \"%s"
+"\"\n"
 
-#: ../g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VARNING: osäkert att infoga katalogrättigheter för tillägget \"%s\"\n"
 
-#: ../g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: ../g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: ../g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: ../g10/gpg.c:1549
+#: g10/gpg.c:1553
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: ../g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: ../g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: ../g10/gpg.c:1557
+#: g10/gpg.c:1561
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: ../g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: ../g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: ../g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: ../g10/gpg.c:1565
+#: g10/gpg.c:1569
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: ../g10/gpg.c:1567
+#: g10/gpg.c:1571
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: ../g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211
-#: ../g10/gpg.c:2854
-#: ../g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, 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:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "chiffertillägget \"%s\" lästes inte in på grund av osäkra rättigheter\n"
+msgstr ""
+"chiffertillägget \"%s\" lästes inte in på grund av osäkra rättigheter\n"
 
-#: ../g10/gpg.c:2379
-#: ../g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, 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:2472
+#: g10/gpg.c:2511
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: ../g10/gpg.c:2495
-#: ../g10/gpg.c:2688
-#: ../g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: ../g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: ../g10/gpg.c:2510
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: ../g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: ../g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: ../g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: ../g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: ../g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: ../g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: ../g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: ../g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: ../g10/gpg.c:2552
+#: g10/gpg.c:2591
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: ../g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: ../g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: ../g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: ../g10/gpg.c:2562
+#: g10/gpg.c:2601
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: ../g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: ../g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: ../g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: ../g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: ../g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: ../g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, 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:2759
+#: g10/gpg.c:2798
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: ../g10/gpg.c:2762
+#: g10/gpg.c:2801
 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:2843
-#: ../sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: ../g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: ../g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: ../g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, 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:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 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:2979
-#: ../g10/gpg.c:3003
-#: ../sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: ../g10/gpg.c:2985
-#: ../g10/gpg.c:3009
-#: ../sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: ../g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: ../g10/gpg.c:2997
+#: g10/gpg.c:3036
 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:3012
+#: g10/gpg.c:3051
 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:3014
+#: g10/gpg.c:3053
 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:3016
+#: g10/gpg.c:3055
 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:3018
+#: g10/gpg.c:3057
 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"
+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:3020
+#: g10/gpg.c:3059
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
+msgstr ""
+"ogiltigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: ../g10/gpg.c:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: ../g10/gpg.c:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 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:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av föredragna krypteringsalgoritmer\n"
 
-#: ../g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: ../g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: ../g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: ../g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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"
+msgstr ""
+"du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: ../g10/gpg.c:3141
+#: g10/gpg.c:3180
 #, 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"
+msgstr ""
+"du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: ../g10/gpg.c:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: ../g10/gpg.c:3244
+#: g10/gpg.c:3283
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
+msgstr ""
+"VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
 
-#: ../g10/gpg.c:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: ../g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: ../g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: ../g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: ../g10/gpg.c:3287
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: ../g10/gpg.c:3289
+#: g10/gpg.c:3338
 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:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: ../g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: ../g10/gpg.c:3338
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: ../g10/gpg.c:3340
+#: g10/gpg.c:3389
 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:3343
+#: g10/gpg.c:3392
 #, 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"
+msgstr ""
+"du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: ../g10/gpg.c:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: ../g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: ../g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: ../g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: ../g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: ../g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: ../g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: ../g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: ../g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: ../g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: ../g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: ../g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: ../g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: ../g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: ../g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: ../g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: ../g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: ../g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: ../g10/gpg.c:4156
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
-#: ../g10/gpgv.c:73
+#: g10/gpgv.c:73
 msgid "take the keys from this keyring"
 msgstr "ta nycklarna från denna nyckelring "
 
 # Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande.
 # Kommandot är avsett att användas i "near online system".
 # Krav från RIPE.
-#: ../g10/gpgv.c:75
+#: g10/gpgv.c:75
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: ../g10/gpgv.c:76
-#: ../sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:367
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: ../g10/gpgv.c:100
+#: g10/gpgv.c:100
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
 
-#: ../g10/gpgv.c:103
+#: g10/gpgv.c:103
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -2449,7 +2297,7 @@ msgstr ""
 "Syntax: gpg [flaggor] [filer]\n"
 "Kolla signaturerna mot betrodda nycklar\n"
 
-#: ../g10/helptext.c:51
+#: g10/helptext.c:51
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -2460,7 +2308,7 @@ msgstr ""
 "\"nätet av tillit\". Det har inget att göra med det (implicit skapade)\n"
 "nätet av certifikat."
 
-#: ../g10/helptext.c:57
+#: g10/helptext.c:57
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -2472,15 +2320,17 @@ msgstr ""
 "- det är vanligen de nycklar som du disponerar den hemliga nyckeln för.\n"
 "Svara  \"ja\" för att markera att du litar förbehållslöst på denna nyckel.\n"
 
-#: ../g10/helptext.c:64
+#: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Om du vill använda denna otillförlitliga nyckel ändå, svara \"ja\"."
 
-#: ../g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Ange användaridentiteten för den adress du vill skicka meddelandet till."
+#: g10/helptext.c:68
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr ""
+"Ange användaridentiteten för den adress du vill skicka meddelandet till."
 
-#: ../g10/helptext.c:72
+#: g10/helptext.c:72
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
@@ -2502,9 +2352,10 @@ msgstr ""
 "\n"
 "RSA kan användas för signaturer eller kryptering.\n"
 "\n"
-"Första (primär) nyckel måste alltid vara en nyckel som är kapabel att signera."
+"Första (primär) nyckel måste alltid vara en nyckel som är kapabel att "
+"signera."
 
-#: ../g10/helptext.c:86
+#: g10/helptext.c:86
 msgid ""
 "In general it is not a good idea to use the same key for signing and\n"
 "encryption.  This algorithm should only be used in certain domains.\n"
@@ -2514,21 +2365,16 @@ msgstr ""
 "och kryptering. Denna algoritm ska endast användas inom särskilda\n"
 "områden. Rådgör med din egen säkerhetsexpert first!"
 
-#: ../g10/helptext.c:93
+#: g10/helptext.c:93
 msgid "Enter the size of the key"
 msgstr "Ange storleken på nyckeln"
 
-#: ../g10/helptext.c:97
-#: ../g10/helptext.c:102
-#: ../g10/helptext.c:114
-#: ../g10/helptext.c:146
-#: ../g10/helptext.c:174
-#: ../g10/helptext.c:179
-#: ../g10/helptext.c:184
+#: g10/helptext.c:97 g10/helptext.c:102 g10/helptext.c:114 g10/helptext.c:146
+#: g10/helptext.c:174 g10/helptext.c:179 g10/helptext.c:184
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svara \"ja\" eller \"nej\""
 
-#: ../g10/helptext.c:107
+#: g10/helptext.c:107
 msgid ""
 "Enter the required value as shown in the prompt.\n"
 "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -2540,19 +2386,19 @@ msgstr ""
 "inte att få något vettigt felmeddelande - istället kommer systemet\n"
 "att försöka tolka det angivna värdet som ett intervall."
 
-#: ../g10/helptext.c:119
+#: g10/helptext.c:119
 msgid "Enter the name of the key holder"
 msgstr "Ange namnet på nyckelns ägare"
 
-#: ../g10/helptext.c:124
+#: g10/helptext.c:124
 msgid "please enter an optional but highly suggested email address"
 msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt"
 
-#: ../g10/helptext.c:128
+#: g10/helptext.c:128
 msgid "Please enter an optional comment"
 msgstr "Ange en kommentar (frivilligt)"
 
-#: ../g10/helptext.c:133
+#: g10/helptext.c:133
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -2566,61 +2412,84 @@ msgstr ""
 "O  för att fortsätta med nyckelgenerering.\n"
 "Q  för att avsluta nyckelgenereringen."
 
-#: ../g10/helptext.c:142
+#: g10/helptext.c:142
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "Svara \"ja\" (eller bara \"j\") om du vill generera denna undernyckel."
 
-#: ../g10/helptext.c:150
+#: g10/helptext.c:150
 msgid ""
 "When you sign a user ID on a key, you should first verify that the key\n"
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this could\n"
-"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with a\n"
-"    photo ID (such as a passport) that the name of the key owner matches the\n"
-"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"När du signerar en användaridentitet på en nyckel, måste du först kontrollera att nyckeln\n"
-"verkligen tillhör den person som nämns i användaridentiteten.  Det är viktigt för andra att\n"
+"När du signerar en användaridentitet på en nyckel, måste du först "
+"kontrollera att nyckeln\n"
+"verkligen tillhör den person som nämns i användaridentiteten.  Det är "
+"viktigt för andra att\n"
 "få veta hur noga du har kontrollerat detta.\n"
 "\n"
-"\"0\" betyder att du inte påstår någonting om hur noga du kontrollerat nyckeln.\n"
+"\"0\" betyder att du inte påstår någonting om hur noga du kontrollerat "
+"nyckeln.\n"
 "\n"
-"\"1\" betyder att du tror att nyckeln tillhör den person som påstår sig göra det\n"
-"    men du kunde inte, eller ville inte kontrollera nyckeln alls.  Detta är användbartför\n"
-"    en \"persona\" kontroll, där du signerar nyckeln för en användare med pseudonym.\n"
+"\"1\" betyder att du tror att nyckeln tillhör den person som påstår sig göra "
+"det\n"
+"    men du kunde inte, eller ville inte kontrollera nyckeln alls.  Detta är "
+"användbartför\n"
+"    en \"persona\" kontroll, där du signerar nyckeln för en användare med "
+"pseudonym.\n"
 "\n"
-"\"2\" betyder att du gjorde viss kontroll av nyckeln. Det kan t.ex. betyda att\n"
-"    du kontrollerade fingeravtrycket och kontrollerade användaridentiteten för nyckeln\n"
+"\"2\" betyder att du gjorde viss kontroll av nyckeln. Det kan t.ex. betyda "
+"att\n"
+"    du kontrollerade fingeravtrycket och kontrollerade användaridentiteten "
+"för nyckeln\n"
 "    mot en fotolegitimation.\n"
 "\n"
-"\"3\" betyder att du gjorde en noggrann och uttömmande kontroll av nyckeln.  Detta kan t.ex.\n"
-"    betyda att du kontrollerade nyckelns fingeravtryck direkt med nyckelinnehavaren\n"
-"    och att du kontrollerade, med hjälp av svårförfalskade identitetsdokument\n"
+"\"3\" betyder att du gjorde en noggrann och uttömmande kontroll av nyckeln.  "
+"Detta kan t.ex.\n"
+"    betyda att du kontrollerade nyckelns fingeravtryck direkt med "
+"nyckelinnehavaren\n"
+"    och att du kontrollerade, med hjälp av svårförfalskade "
+"identitetsdokument\n"
 "a\n"
 "    med foto (t.ex. ett körkort) att namnet på innehavaren stämmer med\n"
-"    namnet i användaridentiteten på nyckeln, och slutligen att du kontrollerade att(genom att utväxla\n"
-"    e-postmeddelanden) att e-postadressen på nyckeln tillhör nyckelinnehavaren.\n"
+"    namnet i användaridentiteten på nyckeln, och slutligen att du "
+"kontrollerade att(genom att utväxla\n"
+"    e-postmeddelanden) att e-postadressen på nyckeln tillhör "
+"nyckelinnehavaren.\n"
 "\n"
 "Observera! Ovanstående exempel för nivåerna 2 och 3 är bara förslag.\n"
 "Slutligen är det bara du själv som avgör vad \"viss\" and \"noggrann\"\n"
@@ -2629,11 +2498,11 @@ msgstr ""
 "Om du inte vet vad du ska svara, så svara \"0\"."
 
 # felstavat original meddelat till Werner.
-#: ../g10/helptext.c:188
+#: g10/helptext.c:188
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "Svara \"ja\" om du vill signera ALLA användaridentiteter"
 
-#: ../g10/helptext.c:192
+#: g10/helptext.c:192
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -2641,11 +2510,11 @@ msgstr ""
 "Svara \"ja\" om du verkligen vill ta bort denna användaridentitet.\n"
 "Alla certifikat kommer att gå förlorade!"
 
-#: ../g10/helptext.c:197
+#: g10/helptext.c:197
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Svara \"ja\" om du vill ta bort denna undernyckel"
 
-#: ../g10/helptext.c:202
+#: g10/helptext.c:202
 msgid ""
 "This is a valid signature on the key; you normally don't want\n"
 "to delete this signature because it may be important to establish a\n"
@@ -2656,7 +2525,7 @@ msgstr ""
 "en tillitskoppling till nyckeln eller en annan nyckel som är\n"
 "certifierad av denna nyckel."
 
-#: ../g10/helptext.c:207
+#: g10/helptext.c:207
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -2668,7 +2537,7 @@ msgstr ""
 "vet vilken nyckel som användes eftersom den nyckeln kanske upprättar\n"
 "en tillitskoppling genom en annan redan certifierad nyckel."
 
-#: ../g10/helptext.c:213
+#: g10/helptext.c:213
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -2677,7 +2546,7 @@ msgstr ""
 "din nyckelring."
 
 # borde inge GnuPG bytas ut mot gpg eller ännu bättre %s?
-#: ../g10/helptext.c:217
+#: g10/helptext.c:217
 msgid ""
 "This is a signature which binds the user ID to the key. It is\n"
 "usually not a good idea to remove such a signature.  Actually\n"
@@ -2691,34 +2560,36 @@ msgstr ""
 "mer. Så gör bara detta om denna självsignatur av någon anledning är\n"
 "ogiltig och det finns en andra signatur som tillgänglig."
 
-#: ../g10/helptext.c:225
+#: g10/helptext.c:225
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
-"Ändra dina inställningar för alla användaridentiteter (eller enbart för en av de valda)\n"
-"till den aktuella listan på inställningar. Tidsstämplingen för alla påverkade\n"
+"Ändra dina inställningar för alla användaridentiteter (eller enbart för en "
+"av de valda)\n"
+"till den aktuella listan på inställningar. Tidsstämplingen för alla "
+"påverkade\n"
 "självsignaturer kommer att flyttas fram en sekund.\n"
 
-#: ../g10/helptext.c:232
+#: g10/helptext.c:232
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Ange en lösenfras. Detta är en hemlig mening\n"
 
-#: ../g10/helptext.c:238
+#: g10/helptext.c:238
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Repetera sista lösenfrasen, så du är säker på vad du skrev in."
 
 # # felstavat/ologiskt original
-#: ../g10/helptext.c:242
+#: g10/helptext.c:242
 msgid "Give the name of the file to which the signature applies"
 msgstr "Ange namnet på den fil signaturen gäller"
 
-#: ../g10/helptext.c:247
+#: g10/helptext.c:247
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svara \"ja\" om det du vill skriva över filen"
 
-#: ../g10/helptext.c:252
+#: g10/helptext.c:252
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -2726,7 +2597,7 @@ msgstr ""
 "Ange ett nytt filnamn. Om du bara trycker RETUR kommer standarfilnamnet\n"
 "(som anges i hakparenteser) att användas."
 
-#: ../g10/helptext.c:258
+#: g10/helptext.c:258
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -2744,7 +2615,8 @@ msgstr ""
 "Du borde ange en anledning till spärrningen. Beroende på sammanhanget\n"
 "har du möjlighet att välja från följande lista:\n"
 "  \"Nyckeln har tappat sin säkerhet\"\n"
-"     Använd denna om du har anledning att tro att icke-auktoriserade personer\n"
+"     Använd denna om du har anledning att tro att icke-auktoriserade "
+"personer\n"
 "     har fått tillgång till din hemliga nyckel.\n"
 "  \"Nyckeln har ersatts\"\n"
 "     Använd denna om du har ersatt denna nyckel med en nyare.\n"
@@ -2755,145 +2627,140 @@ msgstr ""
 "     skall användas. Detta används normalt för att visa att en e-postadress\n"
 "     är ogiltig.\n"
 
-#: ../g10/helptext.c:274
+#: g10/helptext.c:274
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 "Om du vill kan du ange en text som beskriver varför du utfärdar\n"
-"detta spärrcertifikat (revocation certificate). Försök att hålla texten kort och koncis.\n"
+"detta spärrcertifikat (revocation certificate). Försök att hålla texten kort "
+"och koncis.\n"
 "En tom rad avslutar texten.\n"
 
-#: ../g10/helptext.c:289
+#: g10/helptext.c:289
 msgid "No help available"
 msgstr "Det finns ingen hjälp tillgänglig"
 
-#: ../g10/helptext.c:297
+#: g10/helptext.c:297
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
 
-#: ../g10/import.c:96
+#: g10/import.c:96
 msgid "import signatures that are marked as local-only"
 msgstr "importera signaturer som är markerade som local-only"
 
-#: ../g10/import.c:98
+#: g10/import.c:98
 msgid "repair damage from the pks keyserver during import"
 msgstr "reparera skada från pks-nyckelservern under importering"
 
-#: ../g10/import.c:100
+#: g10/import.c:100
 msgid "do not update the trustdb after import"
 msgstr "uppdatera inte tillitsdatabasen efter importering"
 
-#: ../g10/import.c:102
+#: g10/import.c:102
 msgid "create a public key when importing a secret key"
 msgstr "skapa en publik nyckel när en hemlig nyckel importeras"
 
-#: ../g10/import.c:104
+#: g10/import.c:104
 msgid "only accept updates to existing keys"
 msgstr "acceptera endast uppdateringar till befintliga nycklar"
 
-#: ../g10/import.c:106
+#: g10/import.c:106
 msgid "remove unusable parts from key after import"
 msgstr "ta bort oanvändbara delar från nyckeln efter importering"
 
-#: ../g10/import.c:108
+#: g10/import.c:108
 msgid "remove as much as possible from key after import"
 msgstr "ta bort så mycket som möjligt från nyckeln efter importering"
 
-#: ../g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: ../g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu nycklar behandlade än så länge\n"
 
-#: ../g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: ../g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "          överhoppade nya nycklar: %lu\n"
 
-#: ../g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr " utan användaridentiteter: %lu\n"
 
-#: ../g10/import.c:301
-#: ../sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: ../g10/import.c:307
-#: ../sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      oförändrade: %lu\n"
 
-#: ../g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "   nya användaridentiteter: %lu\n"
 
-#: ../g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: ../g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: ../g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nya nyckelspärrningar: %lu\n"
 
-#: ../g10/import.c:317
-#: ../sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal lästa hemliga nycklar: %lu\n"
 
-#: ../g10/import.c:319
-#: ../sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: ../g10/import.c:321
-#: ../sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal oförändrade hemliga nycklar: %lu\n"
 
-#: ../g10/import.c:323
-#: ../sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                   inte importerade: %lu\n"
 
-#: ../g10/import.c:325
+#: g10/import.c:328
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    signaturer rensade: %lu\n"
 
-#: ../g10/import.c:327
+#: g10/import.c:330
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "användaridentiteter rensade: %lu\n"
 
-#: ../g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2902,446 +2769,424 @@ msgstr ""
 "VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
 "algoritmer för dessa användaridentiteter:\n"
 
-#: ../g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": inställning för chifferalgoritmen %s\n"
 
-#: ../g10/import.c:618
+#: g10/import.c:621
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": inställning för sammandragsalgoritmen %s\n"
 
-#: ../g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": inställning för komprimeringsalgoritmen %s\n"
 
-#: ../g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
 
-#: ../g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
 "med att algoritmerna inte stämmer\n"
 
-#: ../g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr "du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
+msgstr ""
+"du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
 
-#: ../g10/import.c:719
-#: ../g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %s: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: ../g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
 
 # vad innebär fnutten i slutet?
-#: ../g10/import.c:763
+#: g10/import.c:766
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "nyckel %s: accepterade icke-självsignerad användaridentitet \"%s\"\n"
 
-#: ../g10/import.c:769
+#: g10/import.c:772
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %s: inga giltiga användaridentiteter\n"
 
-#: ../g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en självsignatur\n"
 
-#: ../g10/import.c:781
-#: ../g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
 
-#: ../g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %s: ny nyckel - hoppade över\n"
 
-#: ../g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: ../g10/import.c:801
-#: ../g10/openfile.c:268
-#: ../g10/sign.c:834
-#: ../g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: ../g10/import.c:805
-#: ../g10/import.c:900
-#: ../g10/import.c:1157
-#: ../g10/import.c:1300
-#: ../g10/import.c:2362
-#: ../g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: ../g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
 
-#: ../g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
 
-#: ../g10/import.c:865
-#: ../g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: ../g10/import.c:873
-#: ../g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: ../g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %s: \"%s\" En ny användaridentitet\n"
 
-#: ../g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
 
-#: ../g10/import.c:916
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %s: \"%s\" En ny signatur\n"
 
-#: ../g10/import.c:919
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
 
-#: ../g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %s: \"%s\" En ny undernyckel\n"
 
-#: ../g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
 
-#: ../g10/import.c:928
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
 
-#: ../g10/import.c:931
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
 
-#: ../g10/import.c:934
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
 
-#: ../g10/import.c:937
+#: g10/import.c:940
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
 
-#: ../g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %s: \"%s\" inte ändrad\n"
 
-#: ../g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
 
-#. We don't allow to import secret keys because that may be used
-#. to put a secret key into the keyring and the user might later
-#. be tricked into signing stuff with that key.
-#: ../g10/import.c:1134
+#: g10/import.c:1137
 msgid "importing secret keys not allowed\n"
 msgstr "importering av hemliga nycklar tillåts inte\n"
 
-#: ../g10/import.c:1151
-#: ../g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: ../g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %s: hemlig nyckel importerades\n"
 
-#. we can't merge secret keys
-#: ../g10/import.c:1192
+#: g10/import.c:1195
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %s: finns redan i hemliga nyckelringen\n"
 
-#: ../g10/import.c:1202
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "nyckel %s: hittade inte hemlig nyckel: %s\n"
 
-#: ../g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
 
-#: ../g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: ../g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
 
-#: ../g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %s: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: ../g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "nyckel %s: algoritmen för publika nycklar stöds inte för användaridentiteten  \"%s\"\n"
+msgstr ""
+"nyckel %s: algoritmen för publika nycklar stöds inte för "
+"användaridentiteten  \"%s\"\n"
 
-#: ../g10/import.c:1390
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %s: ogiltig självsignatur på användaridentiteten \"%s\"\n"
 
-#: ../g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
 
-#: ../g10/import.c:1419
-#: ../g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
 
-#: ../g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %s: ogiltig undernyckelbindning\n"
 
-#: ../g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
 
-#: ../g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
 
-#: ../g10/import.c:1471
+#: g10/import.c:1474
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
 
-#: ../g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
 
-#: ../g10/import.c:1528
+#: g10/import.c:1531
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
 
-#: ../g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %s: hoppade över undernyckel\n"
 
-#: ../g10/import.c:1576
+#: g10/import.c:1579
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "nyckel %s: icke-exporterbar signatur (klass 0x%02X) - hoppade över\n"
 
-#: ../g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %s: spärrcertifikat på fel plats - hoppade över\n"
 
 # nyckeln eller certifikatet??
-#: ../g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
 
-#: ../g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
 
 # nyckeln eller klassen?
-#: ../g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nyckel %s: oväntad signaturklass  (0x%02X) - hoppade över\n"
 
-#: ../g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "nyckel %s: dubblett av användaridentiteten hittades - slog dem samman\n"
+msgstr ""
+"nyckel %s: dubblett av användaridentiteten hittades - slog dem samman\n"
 
-#: ../g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
 
-#: ../g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
 
-#: ../g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
 
-#: ../g10/import.c:1894
+#: g10/import.c:1897
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
 
-#: ../g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
-msgstr "OBSERVERA: serienumret för en nyckel stämmer inte med kortets serienummer\n"
+msgstr ""
+"OBSERVERA: serienumret för en nyckel stämmer inte med kortets serienummer\n"
 
-#: ../g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "OBSERVERA: primärnyckeln är ansluten och lagrad på kort\n"
 
-#: ../g10/import.c:2293
+#: g10/import.c:2296
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "OBSERVERA: sekundärnyckeln är ansluten och lagrad på kort\n"
 
-#: ../g10/keydb.c:170
+#: g10/keydb.c:170
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
 
-#: ../g10/keydb.c:176
+#: g10/keydb.c:176
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: ../g10/keydb.c:317
-#: ../g10/keydb.c:320
+#: g10/keydb.c:317 g10/keydb.c:320
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "nyckelblockresurs \"%s\": %s\n"
 
-#: ../g10/keydb.c:699
+#: g10/keydb.c:699
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: ../g10/keyedit.c:267
+#: g10/keyedit.c:267
 msgid "[revocation]"
 msgstr "[spärr]"
 
-#: ../g10/keyedit.c:268
+#: g10/keyedit.c:268
 msgid "[self-signature]"
 msgstr "[självsignatur]"
 
-#: ../g10/keyedit.c:346
-#: ../g10/keylist.c:390
+#: g10/keyedit.c:346 g10/keylist.c:390
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: ../g10/keyedit.c:348
-#: ../g10/keylist.c:392
+#: g10/keyedit.c:348 g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: ../g10/keyedit.c:350
-#: ../g10/keylist.c:394
+#: g10/keyedit.c:350 g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur validerades inte eftersom nyckeln saknades\n"
 
-#: ../g10/keyedit.c:352
-#: ../g10/keylist.c:396
+#: g10/keyedit.c:352 g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer validerades inte eftersom nycklar saknades\n"
 
-#: ../g10/keyedit.c:354
-#: ../g10/keylist.c:398
+#: g10/keyedit.c:354 g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur validerades inte eftersom ett fel uppstod\n"
 
-#: ../g10/keyedit.c:356
-#: ../g10/keylist.c:400
+#: g10/keyedit.c:356 g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer validerades inte eftersom fel uppstod\n"
 
-#: ../g10/keyedit.c:358
+#: g10/keyedit.c:358
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "En användaridentitet utan giltig självsignatur hittades\n"
 
-#: ../g10/keyedit.c:360
+#: g10/keyedit.c:360
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltiga självsignaturer hittades\n"
 
-#. Same string as pkclist.c:do_edit_ownertrust
-#. This string also used in keyedit.c:trustsig_prompt
-#: ../g10/keyedit.c:416
-#: ../g10/pkclist.c:263
+#: g10/keyedit.c:416 g10/pkclist.c:263
 msgid ""
-"Please decide how far you trust this user to correctly verify other users' keys\n"
-"(by looking at passports, checking fingerprints from different sources, etc.)\n"
+"Please decide how far you trust this user to correctly verify other users' "
+"keys\n"
+"(by looking at passports, checking fingerprints from different sources, "
+"etc.)\n"
 msgstr ""
 "Bestäm hur mycket du litar på denna användare när det gäller att\n"
 "korrekt validera andra användares nycklar (genom att undersöka pass,\n"
 "undersöka fingeravtryck från olika källor, etc.)\n"
 
-#: ../g10/keyedit.c:420
-#: ../g10/pkclist.c:275
+#: g10/keyedit.c:420 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Jag litar marginellt\n"
 
-#: ../g10/keyedit.c:421
-#: ../g10/pkclist.c:277
+#: g10/keyedit.c:421 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Jag litar fullständigt\n"
 
-#: ../g10/keyedit.c:440
+#: g10/keyedit.c:440
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -3351,52 +3196,46 @@ msgstr ""
 "Ett djup större än 1 tillåter att nyckeln som du signerar kan\n"
 "skapa tillitssignaturer åt dig.\n"
 
-#: ../g10/keyedit.c:456
+#: g10/keyedit.c:456
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr "Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
+msgstr ""
+"Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
 
-#: ../g10/keyedit.c:600
+#: g10/keyedit.c:600
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användaridentiteten \"%s\" är spärrad."
 
-#: ../g10/keyedit.c:609
-#: ../g10/keyedit.c:637
-#: ../g10/keyedit.c:664
-#: ../g10/keyedit.c:832
-#: ../g10/keyedit.c:897
-#: ../g10/keyedit.c:1745
+#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: ../g10/keyedit.c:623
-#: ../g10/keyedit.c:651
-#: ../g10/keyedit.c:678
-#: ../g10/keyedit.c:838
-#: ../g10/keyedit.c:1751
+#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: ../g10/keyedit.c:628
+#: g10/keyedit.c:628
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut.."
 
-#: ../g10/keyedit.c:656
+#: g10/keyedit.c:656
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användaridentiteten \"%s\" är inte självsignerad."
 
-#: ../g10/keyedit.c:684
+#: g10/keyedit.c:684
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Användaridentiteten \"%s\" är signerbar.  "
 
-#: ../g10/keyedit.c:686
+#: g10/keyedit.c:686
 msgid "Sign it? (y/N) "
 msgstr "Signera den? (j/N) "
 
-#: ../g10/keyedit.c:708
+#: g10/keyedit.c:708
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -3405,11 +3244,11 @@ msgstr ""
 "Självsignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: ../g10/keyedit.c:717
+#: g10/keyedit.c:717
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vill du göra om den till en självsignatur av OpenPGP-typ? (j/N) "
 
-#: ../g10/keyedit.c:731
+#: g10/keyedit.c:731
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3418,13 +3257,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: ../g10/keyedit.c:735
+#: g10/keyedit.c:735
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/n) "
+msgstr ""
+"Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
+"n) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: ../g10/keyedit.c:756
+#: g10/keyedit.c:756
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -3433,83 +3272,89 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: ../g10/keyedit.c:760
+#: g10/keyedit.c:760
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du ändra den till en fullständigt exporterbar signatur? (j/N) "
 
-#: ../g10/keyedit.c:781
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" var redan lokalt signerad med nyckeln %s\n"
 
-#: ../g10/keyedit.c:784
+#: g10/keyedit.c:784
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %s\n"
 
-#: ../g10/keyedit.c:789
+#: g10/keyedit.c:789
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: ../g10/keyedit.c:811
+#: g10/keyedit.c:811
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %s\n"
 
-#: ../g10/keyedit.c:826
+#: g10/keyedit.c:826
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: ../g10/keyedit.c:844
+#: g10/keyedit.c:844
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
-#: ../g10/keyedit.c:850
+#: g10/keyedit.c:850
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
+msgstr ""
+"Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
 
-#: ../g10/keyedit.c:890
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
-msgstr "Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-läge\n"
+#: g10/keyedit.c:890
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-"
+"läge\n"
 
-#: ../g10/keyedit.c:892
+#: g10/keyedit.c:892
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Detta skulle göra nyckeln oanvändbar i PGP 2.x.\n"
 
-#: ../g10/keyedit.c:917
+#: g10/keyedit.c:917
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
 "personen som nämns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: ../g10/keyedit.c:922
+#: g10/keyedit.c:922
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "     (0) Jag vill inte svara.%s\n"
 
-#: ../g10/keyedit.c:924
+#: g10/keyedit.c:924
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "     (1) Jag har inte kontrollerat alls.%s\n"
 
-#: ../g10/keyedit.c:926
+#: g10/keyedit.c:926
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "     (2) Jag har gjort viss kontroll.%s\n"
 
-#: ../g10/keyedit.c:928
+#: g10/keyedit.c:928
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "     (3) Jag har gjort en noggrann kontroll.%s\n"
 
-#: ../g10/keyedit.c:934
+#: g10/keyedit.c:934
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv \"?\" för mer information): "
 
-#: ../g10/keyedit.c:958
+#: g10/keyedit.c:958
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3518,85 +3363,78 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel \"%s\" (%s)\n"
 
-#: ../g10/keyedit.c:965
+#: g10/keyedit.c:965
 msgid "This will be a self-signature.\n"
 msgstr "Detta kommer att bli en självsignatur.\n"
 
-#: ../g10/keyedit.c:971
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VARNING: signaturen kommer inte att markeras som icke-exporterbar.\n"
 
-#: ../g10/keyedit.c:979
+#: g10/keyedit.c:979
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VARNING: signaturen kommer att markeras som icke-spärrbar.\n"
 
-#: ../g10/keyedit.c:989
+#: g10/keyedit.c:989
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "Signaturen kommer att markeras som icke-exporterbar.\n"
 "\n"
 
-#: ../g10/keyedit.c:996
+#: g10/keyedit.c:996
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Signaturen kommer att märkas som icke möjlig att spärra.\n"
 
-#: ../g10/keyedit.c:1003
+#: g10/keyedit.c:1003
 msgid "I have not checked this key at all.\n"
 msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
 
-#: ../g10/keyedit.c:1008
+#: g10/keyedit.c:1008
 msgid "I have checked this key casually.\n"
 msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
 
-#: ../g10/keyedit.c:1013
+#: g10/keyedit.c:1013
 msgid "I have checked this key very carefully.\n"
 msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
 
-#: ../g10/keyedit.c:1023
+#: g10/keyedit.c:1023
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: ../g10/keyedit.c:1068
-#: ../g10/keyedit.c:4786
-#: ../g10/keyedit.c:4877
-#: ../g10/keyedit.c:4941
-#: ../g10/keyedit.c:5002
-#: ../g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: ../g10/keyedit.c:1133
+#: g10/keyedit.c:1133
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
-msgstr "Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras att ändra.\n"
+msgstr ""
+"Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
+"att ändra.\n"
 
-#: ../g10/keyedit.c:1144
-#: ../g10/keygen.c:3382
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: ../g10/keyedit.c:1148
-#: ../g10/keygen.c:3370
-#: ../g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
 
-#: ../g10/keyedit.c:1152
-#: ../g10/keygen.c:3385
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
 
-#: ../g10/keyedit.c:1156
-#: ../g10/keygen.c:3389
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: ../g10/keyedit.c:1180
+#: g10/keyedit.c:1180
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: ../g10/keyedit.c:1186
+#: g10/keyedit.c:1186
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3604,12 +3442,11 @@ msgstr ""
 "Skriv in den nya lösenfrasen för den hemliga nyckeln.\n"
 "\n"
 
-#: ../g10/keyedit.c:1195
-#: ../g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenfrasen repeterades inte korrekt; försök igen."
 
-#: ../g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3617,435 +3454,425 @@ msgstr ""
 "Du vill inte ha någon lösenfras - detta är möjligen en *dålig* idé!\n"
 "\n"
 
-#: ../g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? (j/N) "
 
-#: ../g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: ../g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: ../g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 msgid "show key fingerprint"
 msgstr "visa nyckelns fingeravtryck"
 
-#: ../g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "lista nycklar och användaridentiteter"
 
-#: ../g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "välj användaridentiteten N"
 
-#: ../g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 msgid "select subkey N"
 msgstr "välj undernyckel N"
 
-#: ../g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 msgid "check signatures"
 msgstr "kontrollera signaturer"
 
-#: ../g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
-msgstr "signera valda användaridentiteter [* se nedan för relaterade kommandon]"
+msgstr ""
+"signera valda användaridentiteter [* se nedan för relaterade kommandon]"
 
-#. "lsign" and friends will never match since "sign" comes first
-#. and it is a tail match.  They are just here so they show up in
-#. the help menu.
-#: ../g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs locally"
 msgstr "signera valda användaridentiteter lokalt"
 
-#: ../g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr "signera valda användaridentiteter med en tillitssignatur"
 
-#: ../g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
 
-#: ../g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: ../g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "lägg till ett foto-id"
 
-#: ../g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 msgid "delete selected user IDs"
 msgstr "ta bort valda användaridentiteter"
 
-#: ../g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 msgid "add a subkey"
 msgstr "lägg till en undernyckel"
 
-#: ../g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr "lägg till en nyckel till ett smartkort"
 
-#: ../g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr "flytta en nyckel till ett smartkort"
 
-#: ../g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr "flytta en nyckelkopia till ett smartkort"
 
-#: ../g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 msgid "delete selected subkeys"
 msgstr "ta bort valda undernycklar"
 
-#: ../g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: ../g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 msgid "delete signatures from the selected user IDs"
 msgstr "ta bort signaturer från valda användaridentiteter"
 
-#: ../g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
 
-#: ../g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr "flagga vald användaridentitet som primär"
 
-#: ../g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 msgid "toggle between the secret and public key listings"
 msgstr "växla mellan att lista hemliga och publika nycklar"
 
-#: ../g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "lista inställningar (expertläge)"
 
-#: ../g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "lista inställningar (utförligt)"
 
-#: ../g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 msgid "set preference list for the selected user IDs"
 msgstr "ställ in inställningslista för valda användaridentiteter"
 
-#: ../g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 msgid "set the preferred keyserver URL for the selected user IDs"
-msgstr "ställ in url till föredragen nyckelserver för valda användaridentiteter"
+msgstr ""
+"ställ in url till föredragen nyckelserver för valda användaridentiteter"
 
-#: ../g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 msgid "set a notation for the selected user IDs"
 msgstr "ställ in en notation för valda användaridentiteter"
 
-#: ../g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "ändra lösenfrasen"
 
 # originalet borde ha ett value
-#: ../g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: ../g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke signatures on the selected user IDs"
 msgstr "spärra signaturer på valda användaridentiteter"
 
-#: ../g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "revoke selected user IDs"
 msgstr "spärra valda användaridentiteter"
 
-#: ../g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr "spärra nyckel eller valda undernycklar"
 
-#: ../g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 msgid "enable key"
 msgstr "aktivera nyckel"
 
-#: ../g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 msgid "disable key"
 msgstr "inaktivera nyckel"
 
-#: ../g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr "visa valda foto-id:n"
 
-#: ../g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
-msgstr "komprimera oanvändbara användaridentiteter och ta bort oanvändbara signaturer från nyckeln"
+msgstr ""
+"komprimera oanvändbara användaridentiteter och ta bort oanvändbara "
+"signaturer från nyckeln"
 
-#: ../g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
-msgstr "komprimera oanvändbara användaridentiteter och ta bort alla signaturer från nyckeln"
+msgstr ""
+"komprimera oanvändbara användaridentiteter och ta bort alla signaturer från "
+"nyckeln"
 
-#: ../g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fel vid läsning av hemligt nyckelblock \"%s\": %s\n"
 
-#: ../g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: ../g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: ../g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: ../g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
-"* The `sign' command may be prefixed with an `l' for local signatures (lsign),\n"
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
-"* Kommandot \"sign\" kan inledas med ett \"l\" för lokal signaturer (lsign),\n"
-"  ett \"t\" för tillitssignaturer (tsign), ett \"nr\" för icke-sprärrbara signaturer\n"
+"* Kommandot \"sign\" kan inledas med ett \"l\" för lokal signaturer "
+"(lsign),\n"
+"  ett \"t\" för tillitssignaturer (tsign), ett \"nr\" för icke-sprärrbara "
+"signaturer\n"
 "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
 
-#: ../g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: ../g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Verkligen signera alla användaridentiteter? (j/N) "
 
-#: ../g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
 
-#: ../g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Okänd signaturtyp \"%s\"\n"
 
-#: ../g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: ../g10/keyedit.c:1819
-#: ../g10/keyedit.c:1839
-#: ../g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: ../g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: ../g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
 
-#: ../g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
 
-#: ../g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr "Verkligen flytta den primära nyckeln? (j/N) "
 
-#: ../g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja exakt en nyckel.\n"
 
-#: ../g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr "Kommandot förväntar ett filnamnsargument\n"
 
-#: ../g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan inte öppna \"%s\": %s\n"
 
-#: ../g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
 
-#: ../g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: ../g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: ../g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
 
-#: ../g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
 
-#: ../g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Verkligen spärra denna användaridentitet? (j/N) "
 
-#: ../g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vill du verkligen spärra hela nyckeln? (j/N) "
 
-#: ../g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
 
-#: ../g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
 
-#: ../g10/keyedit.c:2090
-msgid "Owner trust may not be set while using an user provided trust database\n"
-msgstr "Ägartillit får inte ställas in när en tillitsdatabas används som användaren tillhandahåller\n"
+#: g10/keyedit.c:2096
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+"Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
+"tillhandahåller\n"
 
-#: ../g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr "Ställ in inställningslista till:\n"
 
-#: ../g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "Vill du verkligen uppdatera inställningarna för valda användaridentiteter? (j/N) "
+msgstr ""
+"Vill du verkligen uppdatera inställningarna för valda användaridentiteter? "
+"(j/N) "
 
-#: ../g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
 
-#: ../g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringar? (j/N) "
 
-#: ../g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: ../g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: ../g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: ../g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: ../g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: ../g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: ../g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: ../g10/keyedit.c:2414
-#: ../g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: ../g10/keyedit.c:2422
-#: ../g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: ../g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-typ.\n"
+msgstr ""
+"Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-"
+"typ.\n"
 
-#: ../g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Den här nyckeln blev spärrad den %s av %s nyckel %s\n"
 
-#: ../g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
 
-#: ../g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: ../g10/keyedit.c:2735
-#: ../g10/keyedit.c:2791
-#: ../g10/keyedit.c:2852
-#: ../g10/keyedit.c:2867
-#: ../g10/keylist.c:194
-#: ../g10/keyserver.c:516
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: ../g10/keyedit.c:2738
-#: ../g10/keylist.c:771
-#: ../g10/keylist.c:865
-#: ../g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: ../g10/keyedit.c:2740
-#: ../g10/keylist.c:742
-#: ../g10/keylist.c:777
-#: ../g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: ../g10/keyedit.c:2742
-#: ../g10/keyedit.c:2793
-#: ../g10/keyedit.c:2854
-#: ../g10/keyedit.c:2869
-#: ../g10/keylist.c:196
-#: ../g10/keylist.c:748
-#: ../g10/keylist.c:783
-#: ../g10/keylist.c:877
-#: ../g10/keylist.c:898
-#: ../g10/keyserver.c:522
-#: ../g10/mainproc.c:958
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: ../g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: ../g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: ../g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: ../g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: ../g10/keyedit.c:2798
-#: ../g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: ../g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4053,25 +3880,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: ../g10/keyedit.c:2886
-#: ../g10/keyedit.c:3232
-#: ../g10/keyserver.c:526
-#: ../g10/mainproc.c:1753
-#: ../g10/trustdb.c:1179
-#: ../g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "spärrad"
 
-#: ../g10/keyedit.c:2888
-#: ../g10/keyedit.c:3234
-#: ../g10/keyserver.c:530
-#: ../g10/mainproc.c:1755
-#: ../g10/trustdb.c:532
-#: ../g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "utgånget"
 
-#: ../g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4080,344 +3899,352 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: ../g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
-"VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan vissa versioner\n"
+"VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan "
+"vissa versioner\n"
 "         av PGP avvisa denna nyckel.\n"
 
-#: ../g10/keyedit.c:3019
-#: ../g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
-#: ../g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
 
-#: ../g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: ../g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: ../g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: ../g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Verkligen ta bort denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: ../g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: ../g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: ../g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: ../g10/keyedit.c:3236
-#: ../g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: ../g10/keyedit.c:3252
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Användaridentitet \"%s\": redan rensad\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
+
+#: g10/keyedit.c:3252
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "Användaridentitet \"%s\": redan rensad\n"
+
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: ../g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
-"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may cause\n"
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
-"VARNING: Detta är en PGP 2.x-nyckel. Om du lägger till en spärrnyckel kan denna\n"
+"VARNING: Detta är en PGP 2.x-nyckel. Om du lägger till en spärrnyckel kan "
+"denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: ../g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
 
-#: ../g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: ../g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2.x-nyckel som spärrnyckel\n"
 
-#. This actually causes no harm (after all, a key that
-#. designates itself as a revoker is the same as a
-#. regular key), but it's easy enough to check.
-#: ../g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan inte ange en nyckel som sin egen spärrnyckel\n"
 
-#: ../g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "den här nyckeln har redan markerats som en spärrnyckel\n"
 
-#: ../g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: ../g10/keyedit.c:3462
-msgid "Are you sure you want to appoint this key as a designated revoker? (y/N) "
-msgstr "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
+#: g10/keyedit.c:3473
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgstr ""
+"Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: ../g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: ../g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som mest en undernyckel.\n"
 
-#: ../g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: ../g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: ../g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: ../g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
 # Vad betyder det?
-#: ../g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: ../g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "undernyckeln %s signerar inte och behöver inte att korscertifieras\n"
 
-#: ../g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: ../g10/keyedit.c:3878
-#: ../g10/keyedit.c:3988
-#: ../g10/keyedit.c:4108
-#: ../g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
 
-#: ../g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Ange din föredragna nyckelserver-url: "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: ../g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Är du säker på att du vill ersätta det? (j/N) "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: ../g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Är du säker på att du vill ta bort det? (j/N) "
 
-#: ../g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: ../g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: ../g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: ../g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: ../g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: ../g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: ../g10/keyedit.c:4628
-#: ../g10/keyedit.c:4692
-#: ../g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signerat av din nyckel %s den %s%s%s\n"
 
-#: ../g10/keyedit.c:4630
-#: ../g10/keyedit.c:4694
-#: ../g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: ../g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: ../g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Är du säker på att du fortfarande vill spärra den? (j/N)"
 
-#: ../g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#. FIXME: detect duplicates here
-#: ../g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n"
 
-#: ../g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: ../g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: ../g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: ../g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: ../g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: ../g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Användaridentiteten \"%s\" är redan spärrad\n"
 
-#. Okay, this is a problem.  The user ID selfsig was
-#. created in the future, so we need to warn the user and
-#. set our revocation timestamp one second after that so
-#. everything comes out clean.
-#: ../g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "VARNING: en signatur på en användaridentitet är daterad %d sekunder in i framtiden\n"
+msgstr ""
+"VARNING: en signatur på en användaridentitet är daterad %d sekunder in i "
+"framtiden\n"
 
-#: ../g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: ../g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: ../g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
 
-#: ../g10/keygen.c:265
+#: g10/keygen.c:265
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "inställningen \"%s\" förekommer flera gånger\n"
 
-#: ../g10/keygen.c:272
+#: g10/keygen.c:272
 msgid "too many cipher preferences\n"
 msgstr "för många chifferinställningar\n"
 
-#: ../g10/keygen.c:274
+#: g10/keygen.c:274
 msgid "too many digest preferences\n"
 msgstr "för många sammandragsinställningar\n"
 
-#: ../g10/keygen.c:276
+#: g10/keygen.c:276
 msgid "too many compression preferences\n"
 msgstr "för många komprimeringsinställningar\n"
 
-#: ../g10/keygen.c:401
+#: g10/keygen.c:401
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "ogiltig post \"%s\" i inställningssträngen\n"
 
-#: ../g10/keygen.c:875
+#: g10/keygen.c:875
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: ../g10/keygen.c:914
+#: g10/keygen.c:914
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: ../g10/keygen.c:964
+#: g10/keygen.c:964
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: ../g10/keygen.c:1125
-#: ../g10/keygen.c:1239
-#: ../g10/keygen.c:1244
-#: ../g10/keygen.c:1377
-#: ../g10/keygen.c:2933
+#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: ../g10/keygen.c:1130
-#: ../g10/keygen.c:1250
-#: ../g10/keygen.c:1382
-#: ../g10/keygen.c:2939
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: ../g10/keygen.c:1276
-msgid "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
-msgstr "VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här sammandragsstorleken\n"
+#: g10/keygen.c:1276
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+"VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
+"sammandragsstorleken\n"
 
-#: ../g10/keygen.c:1492
+#: g10/keygen.c:1492
 msgid "Sign"
 msgstr "Signera"
 
-#: ../g10/keygen.c:1495
+#: g10/keygen.c:1495
 msgid "Certify"
 msgstr "Certifiera"
 
-#: ../g10/keygen.c:1498
+#: g10/keygen.c:1498
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: ../g10/keygen.c:1501
+#: g10/keygen.c:1501
 msgid "Authenticate"
 msgstr "Autentisera"
 
@@ -4425,111 +4252,110 @@ msgstr "Autentisera"
 # K = Kryptera
 # A = Authentisera
 # Q = Avsluta
-#: ../g10/keygen.c:1509
+#: g10/keygen.c:1509
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: ../g10/keygen.c:1528
+#: g10/keygen.c:1528
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Möjliga åtgärder för en %s-nyckel: "
 
-#: ../g10/keygen.c:1532
+#: g10/keygen.c:1532
 msgid "Current allowed actions: "
 msgstr "För närvarande tillåtna åtgärder: "
 
-#: ../g10/keygen.c:1537
+#: g10/keygen.c:1537
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Växla signeringsförmågan\n"
 
-#: ../g10/keygen.c:1540
+#: g10/keygen.c:1540
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Växla krypteringsförmågan\n"
 
-#: ../g10/keygen.c:1543
+#: g10/keygen.c:1543
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Växla autentiseringsförmågan\n"
 
-#: ../g10/keygen.c:1546
+#: g10/keygen.c:1546
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Färdig\n"
 
-#: ../g10/keygen.c:1602
+#: g10/keygen.c:1602
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: ../g10/keygen.c:1604
+#: g10/keygen.c:1604
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA och Elgamal (standard)\n"
 
-#: ../g10/keygen.c:1605
+#: g10/keygen.c:1605
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: ../g10/keygen.c:1607
+#: g10/keygen.c:1607
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
 
-#: ../g10/keygen.c:1609
+#: g10/keygen.c:1609
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (endast kryptering)\n"
 
-#: ../g10/keygen.c:1610
+#: g10/keygen.c:1610
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: ../g10/keygen.c:1612
+#: g10/keygen.c:1612
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: ../g10/keygen.c:1614
+#: g10/keygen.c:1614
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ställ in dina egna förmågor)\n"
 
-#: ../g10/keygen.c:1683
+#: g10/keygen.c:1683
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-nyckelparet kommer att ha %u bitar.\n"
 
-#: ../g10/keygen.c:1693
+#: g10/keygen.c:1693
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
 
-#: ../g10/keygen.c:1700
+#: g10/keygen.c:1700
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 
-#: ../g10/keygen.c:1714
+#: g10/keygen.c:1714
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
 
-#: ../g10/keygen.c:1720
+#: g10/keygen.c:1720
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: ../g10/keygen.c:1725
-#: ../g10/keygen.c:1730
+#: g10/keygen.c:1725 g10/keygen.c:1730
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: ../g10/keygen.c:1779
+#: g10/keygen.c:1779
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4546,7 +4372,7 @@ msgstr ""
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: ../g10/keygen.c:1790
+#: g10/keygen.c:1790
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4562,38 +4388,38 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: ../g10/keygen.c:1813
+#: g10/keygen.c:1813
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: ../g10/keygen.c:1818
+#: g10/keygen.c:1818
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: ../g10/keygen.c:1836
+#: g10/keygen.c:1836
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: ../g10/keygen.c:1843
+#: g10/keygen.c:1843
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: ../g10/keygen.c:1844
+#: g10/keygen.c:1844
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: ../g10/keygen.c:1849
+#: g10/keygen.c:1849
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: ../g10/keygen.c:1850
+#: g10/keygen.c:1850
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: ../g10/keygen.c:1856
+#: g10/keygen.c:1854
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4601,63 +4427,66 @@ msgstr ""
 "Ditt system kan inte visa datum senare än år 2038.\n"
 "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
 
-#: ../g10/keygen.c:1861
+#: g10/keygen.c:1861
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: ../g10/keygen.c:1884
+#: g10/keygen.c:1884
 msgid ""
 "\n"
-"You need a user ID to identify your key; the software constructs the user ID\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
 "from the Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 msgstr ""
 "\n"
-"Du behöver en användaridentitet för att identifiera din nyckel; programvaran\n"
-"konstruerar en användaridentitet från verkligt namn, kommentar och e-postadress\n"
+"Du behöver en användaridentitet för att identifiera din nyckel; "
+"programvaran\n"
+"konstruerar en användaridentitet från verkligt namn, kommentar och e-"
+"postadress\n"
 "enligt följande format: \n"
 "    \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: ../g10/keygen.c:1897
+#: g10/keygen.c:1897
 msgid "Real name: "
 msgstr "Namn: "
 
-#: ../g10/keygen.c:1905
+#: g10/keygen.c:1905
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: ../g10/keygen.c:1907
+#: g10/keygen.c:1907
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: ../g10/keygen.c:1909
+#: g10/keygen.c:1909
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: ../g10/keygen.c:1917
+#: g10/keygen.c:1917
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: ../g10/keygen.c:1923
+#: g10/keygen.c:1923
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: ../g10/keygen.c:1931
+#: g10/keygen.c:1931
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: ../g10/keygen.c:1937
+#: g10/keygen.c:1937
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: ../g10/keygen.c:1959
+#: g10/keygen.c:1959
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckentabellen \"%s\"\n"
 
-#: ../g10/keygen.c:1965
+#: g10/keygen.c:1965
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4668,7 +4497,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: ../g10/keygen.c:1970
+#: g10/keygen.c:1970
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 
@@ -4684,24 +4513,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: ../g10/keygen.c:1986
+#: g10/keygen.c:1986
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: ../g10/keygen.c:1996
+#: g10/keygen.c:1996
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: ../g10/keygen.c:1997
+#: g10/keygen.c:1997
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: ../g10/keygen.c:2016
+#: g10/keygen.c:2016
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: ../g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4709,12 +4538,12 @@ msgstr ""
 "Du behöver en lösenfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: ../g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: ../g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4726,7 +4555,7 @@ msgstr ""
 "om du använder detta program med flaggan \"--edit-key\".\n"
 "\n"
 
-#: ../g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4738,760 +4567,743 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd entropidata.\n"
 
-#: ../g10/keygen.c:2878
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: ../g10/keygen.c:3090
-#: ../g10/keygen.c:3235
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den publika nyckeln till \"%s\"\n"
 
-#: ../g10/keygen.c:3092
-#: ../g10/keygen.c:3238
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skrier hemliga nyckelstumpen till \"%s\"\n"
 
-#: ../g10/keygen.c:3095
-#: ../g10/keygen.c:3241
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: ../g10/keygen.c:3224
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: ../g10/keygen.c:3230
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "hittade ingen hemlig nyckelring som gick att skriva till: %s\n"
 
-#: ../g10/keygen.c:3248
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
 
-#: ../g10/keygen.c:3255
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: ../g10/keygen.c:3278
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
 
 # Flagga.. inte kommando
-#: ../g10/keygen.c:3289
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 "Observera att denna nyckel inte kan användas för kryptering. Du kanske\n"
-"vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta syfte.\n"
+"vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta "
+"syfte.\n"
 
-#: ../g10/keygen.c:3301
-#: ../g10/keygen.c:3430
-#: ../g10/keygen.c:3546
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: ../g10/keygen.c:3353
-#: ../g10/keygen.c:3481
-#: ../g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: ../g10/keygen.c:3355
-#: ../g10/keygen.c:3483
-#: ../g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: ../g10/keygen.c:3364
-#: ../g10/keygen.c:3494
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
-#: ../g10/keygen.c:3403
-#: ../g10/keygen.c:3527
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
-#: ../g10/keygen.c:3690
+#: g10/keygen.c:3714
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
 
-#: ../g10/keygen.c:3738
+#: g10/keygen.c:3762
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
 
-#: ../g10/keygen.c:3764
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
 
-#: ../g10/keyid.c:539
-#: ../g10/keyid.c:551
-#: ../g10/keyid.c:563
-#: ../g10/keyid.c:575
+#: g10/keyid.c:540 g10/keyid.c:552 g10/keyid.c:564 g10/keyid.c:576
 msgid "never     "
 msgstr "aldrig"
 
-#: ../g10/keylist.c:265
+#: g10/keylist.c:265
 msgid "Critical signature policy: "
 msgstr "Viktig signaturpolicy: "
 
-#: ../g10/keylist.c:267
+#: g10/keylist.c:267
 msgid "Signature policy: "
 msgstr "Signaturpolicy: "
 
-#: ../g10/keylist.c:306
+#: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
 msgstr "Föredragen kritisk nyckelserver: "
 
-#: ../g10/keylist.c:359
+#: g10/keylist.c:359
 msgid "Critical signature notation: "
 msgstr "Kritisk signaturnotation: "
 
-#: ../g10/keylist.c:361
+#: g10/keylist.c:361
 msgid "Signature notation: "
 msgstr "Signaturnotation: "
 
-#: ../g10/keylist.c:471
+#: g10/keylist.c:471
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: ../g10/keylist.c:1506
+#: g10/keylist.c:1506
 msgid "Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: ../g10/keylist.c:1508
+#: g10/keylist.c:1508
 msgid "     Subkey fingerprint:"
 msgstr "    Undernyckelns fingeravtryck:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: ../g10/keylist.c:1515
+#: g10/keylist.c:1515
 msgid " Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: ../g10/keylist.c:1517
+#: g10/keylist.c:1517
 msgid "      Subkey fingerprint:"
 msgstr "     Undernyckelns fingeravtryck:"
 
-#. use tty
-#: ../g10/keylist.c:1521
-#: ../g10/keylist.c:1525
+#: g10/keylist.c:1521 g10/keylist.c:1525
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#. Handled elsewhere.
-#: ../g10/keylist.c:1592
+#: g10/keylist.c:1592
 msgid "      Card serial no. ="
 msgstr "      Kortets serienr ="
 
-#: ../g10/keyring.c:1251
+#: g10/keyring.c:1251
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
 # Enligt Werner uppstår detta om något går snett när den hemliga nyckeln uppdateras.
-#: ../g10/keyring.c:1256
+#: g10/keyring.c:1256
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: ../g10/keyring.c:1258
+#: g10/keyring.c:1258
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: ../g10/keyring.c:1259
+#: g10/keyring.c:1259
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: ../g10/keyring.c:1260
+#: g10/keyring.c:1260
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
-#: ../g10/keyring.c:1382
+#: g10/keyring.c:1382
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "mellanlagrar nyckelringen \"%s\"\n"
 
-#: ../g10/keyring.c:1428
+#: g10/keyring.c:1428
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
 
-#: ../g10/keyring.c:1440
+#: g10/keyring.c:1440
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade (%lu signaturer)\n"
 
-#: ../g10/keyring.c:1512
+#: g10/keyring.c:1512
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: ../g10/keyserver.c:66
+#: g10/keyserver.c:66
 msgid "include revoked keys in search results"
 msgstr "inkludera spärrade nycklar i sökresultatet"
 
-#: ../g10/keyserver.c:67
+#: g10/keyserver.c:67
 msgid "include subkeys when searching by key ID"
 msgstr "inkludera undernycklar vid sökning efter nyckel-id"
 
-#: ../g10/keyserver.c:69
+#: g10/keyserver.c:69
 msgid "use temporary files to pass data to keyserver helpers"
-msgstr "använd temporärfiler för att skicka data till nyckelserverns hjälpprogram"
+msgstr ""
+"använd temporärfiler för att skicka data till nyckelserverns hjälpprogram"
 
-#: ../g10/keyserver.c:71
+#: g10/keyserver.c:71
 msgid "do not delete temporary files after using them"
 msgstr "ta inte bort temporärfiler efter de använts"
 
-#: ../g10/keyserver.c:75
+#: g10/keyserver.c:75
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "hämta automatiskt nycklar vid validering av signaturer"
 
-#: ../g10/keyserver.c:77
+#: g10/keyserver.c:77
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "respektera föredragen nyckelserver-url inställd i nyckeln"
 
-#: ../g10/keyserver.c:79
+#: g10/keyserver.c:79
 msgid "honor the PKA record set on a key when retrieving keys"
 msgstr "respektera PKA-posten inställd på en nyckel när nycklar hämtas"
 
-#: ../g10/keyserver.c:145
+#: g10/keyserver.c:145
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
-msgstr "VARNING: nyckelserverflaggan \"%s\" används inte på den här plattformen\n"
+msgstr ""
+"VARNING: nyckelserverflaggan \"%s\" används inte på den här plattformen\n"
 
-#: ../g10/keyserver.c:528
+#: g10/keyserver.c:528
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: ../g10/keyserver.c:729
+#: g10/keyserver.c:729
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
 
-#: ../g10/keyserver.c:813
-#: ../g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
 
-#: ../g10/keyserver.c:911
+#: g10/keyserver.c:911
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
 
-#: ../g10/keyserver.c:913
+#: g10/keyserver.c:913
 msgid "key not found on keyserver\n"
 msgstr "nyckeln hittades inte på nyckelservern\n"
 
-#: ../g10/keyserver.c:1154
+#: g10/keyserver.c:1154
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckeln %s från %s server %s\n"
 
-#: ../g10/keyserver.c:1158
+#: g10/keyserver.c:1158
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: ../g10/keyserver.c:1182
+#: g10/keyserver.c:1182
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "söker efter namn från %s-servern %s\n"
 
-#: ../g10/keyserver.c:1185
+#: g10/keyserver.c:1185
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "söker efter namn från %s\n"
 
-#: ../g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "skickar nycken %s till %s-servern %s\n"
 
-#: ../g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "skickar nyckeln %s till %s\n"
 
-#: ../g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker efter \"%s\" från %s-servern %s\n"
 
-#: ../g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker efter \"%s\" från %s\n"
 
-#: ../g10/keyserver.c:1394
-#: ../g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 msgid "no keyserver action!\n"
 msgstr "ingen nyckelserveråtgärd!\n"
 
-#: ../g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VARNING: nyckelserverhanteraren från en annan version av GnuPG (%s)\n"
 
-#: ../g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr "nyckelserver skickade inte VERSION\n"
 
-#: ../g10/keyserver.c:1513
-#: ../g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
 
-#: ../g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "externa anrop till nyckelserver stöds inte i detta bygge\n"
 
-#: ../g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "ingen hanterare för nyckelserverschemat \"%s\"\n"
 
-#: ../g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "åtgärden \"%s\" stöds inte med nyckelserverschemat \"%s\"\n"
 
-#: ../g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s har inte stöd för hanterarversionen %d\n"
 
-#: ../g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 msgid "keyserver timed out\n"
 msgstr "tidsgräns överstigen för nyckelserver\n"
 
-#: ../g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 msgid "keyserver internal error\n"
 msgstr "internt fel i nyckelserver\n"
 
-#: ../g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikationsfel mot nyckelserver: %s\n"
 
-#: ../g10/keyserver.c:1590
-#: ../g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
 
-#: ../g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kunde inte uppdatera nyckeln %s via %s: %s\n"
 
-#: ../g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "uppdaterar en nyckel från %s\n"
 
-#: ../g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "uppdaterar %d nycklar från %s\n"
 
-#: ../g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
 
-#: ../g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VARNING: kunde inte tolka uri:n %s\n"
 
-#: ../g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: ../g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s  krypterad sessionsnyckel\n"
 
-#: ../g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
 
-#: ../g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, c-format
 msgid "public key is %s\n"
 msgstr "publik nyckel är %s\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: ../g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: ../g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, id %s, skapad %s\n"
 
-#: ../g10/mainproc.c:448
-#: ../g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: ../g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, id %s\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: ../g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: ../g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: ../g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenfras\n"
 
-#: ../g10/mainproc.c:514
-#: ../g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: ../g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA-kryptering inte installerad. Optimistiskt försök att använda %s istället\n"
+msgstr ""
+"IDEA-kryptering inte installerad. Optimistiskt försök att använda %s "
+"istället\n"
 
-#: ../g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
 # Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
-#: ../g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
 # Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
-#: ../g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: ../g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: ../g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: ../g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: ../g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående spärrcertifikat - använd \"gpg --import\" för\n"
 "att verkställa\n"
 
-#: ../g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: ../g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering nertystad\n"
 
-#: ../g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: ../g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: ../g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               med %s nyckel %s\n"
 
-#: ../g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
 
-#. According to my favorite copy editor, in English
-#. grammar, you say "at" if the key is located on a web
-#. page, but "from" if it is located on a keyserver.  I'm
-#. not going to even try to make two strings here :)
-#: ../g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: ../g10/mainproc.c:1661
-#: ../g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: ../g10/mainproc.c:1663
-#: ../g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: ../g10/mainproc.c:1665
-#: ../g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
 # Visas vid ogiltig signatur:
 # Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
-#: ../g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: ../g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: ../g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: ../g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: ../g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: ../g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "binär"
 
-#: ../g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "textläge"
 
-#: ../g10/mainproc.c:1854
-#: ../g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "okänd"
 
-#: ../g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: ../g10/mainproc.c:1946
-#: ../g10/mainproc.c:1962
-#: ../g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: ../g10/mainproc.c:1989
-msgid "WARNING: multiple signatures detected.  Only the first will be checked.\n"
-msgstr "VARNING: multipla signaturer upptäckta. Endast den första kommer att kontrolleras.\n"
+#: g10/mainproc.c:2051
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"VARNING: multipla signaturer upptäckta. Endast den första kommer att "
+"kontrolleras.\n"
 
-#: ../g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: ../g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: ../g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ogiltigt rotpaket hittades i proc_tree()\n"
 
-#: ../g10/misc.c:157
-#: ../g10/misc.c:185
-#: ../g10/misc.c:257
+#: g10/misc.c:157 g10/misc.c:185 g10/misc.c:257
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "fstat för \"%s\" misslyckades i %s: %s\n"
 
-#: ../g10/misc.c:222
+#: g10/misc.c:222
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fstat(%d) misslyckades i %s: %s\n"
 
-#: ../g10/misc.c:336
+#: g10/misc.c:336
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VARNING: använder experimentella algoritmen %s för publik nyckel\n"
 
-#: ../g10/misc.c:351
+#: g10/misc.c:351
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VARNING: använder experimentella chifferalgoritmen %s\n"
 
-#: ../g10/misc.c:366
+#: g10/misc.c:366
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
 
-#: ../g10/misc.c:371
+#: g10/misc.c:371
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
 
-#: ../g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Insticksprogram för IDEA-kryptering är inte installerat\n"
 
-#: ../g10/misc.c:487
-#: ../g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se %s för mer information\n"
 
-#: ../g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: alternativet är föråldrat\"%s\"\n"
 
-#: ../g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: ../g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: ../g10/misc.c:735
+#: g10/misc.c:739
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VARNING: \"%s\" är ett föråldrat kommando - använd det inte\n"
 
-#: ../g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: ../g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: ../g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "detta meddelande kanske inte kan användas av %s\n"
 
-#: ../g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: ../g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#. do not overwrite
-#: ../g10/openfile.c:87
+#: g10/openfile.c:87
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Filen \"%s\" finns. "
 
-#: ../g10/openfile.c:91
+#: g10/openfile.c:91
 msgid "Overwrite? (y/N) "
 msgstr "Skriv över? (j/N) "
 
-#: ../g10/openfile.c:124
+#: g10/openfile.c:124
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: okänt suffix\n"
 
-#: ../g10/openfile.c:146
+#: g10/openfile.c:148
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: ../g10/openfile.c:191
+#: g10/openfile.c:193
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: ../g10/openfile.c:306
+#: g10/openfile.c:308
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signera data finns i filen \"%s\"\n"
 
-#: ../g10/openfile.c:385
+#: g10/openfile.c:387
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "ny konfigurationsfil \"%s\" skapad\n"
 
-#: ../g10/openfile.c:387
+#: g10/openfile.c:389
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgstr "VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
+msgstr ""
+"VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
 
-#: ../g10/parse-packet.c:192
+#: g10/parse-packet.c:192
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
 
-#: ../g10/parse-packet.c:762
+#: g10/parse-packet.c:762
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: ../g10/parse-packet.c:1213
+#: g10/parse-packet.c:1213
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: ../g10/passphrase.c:310
-#: ../g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (primära nyckelns id %s)"
 
-#: ../g10/passphrase.c:324
+#: g10/passphrase.c:324
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5502,25 +5314,24 @@ msgstr ""
 "nyckeln för användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, id %s, skapad %s%s\n"
 
-#: ../g10/passphrase.c:349
+#: g10/passphrase.c:349
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenfrasen\n"
 
-#: ../g10/passphrase.c:351
+#: g10/passphrase.c:351
 msgid "Enter passphrase\n"
 msgstr "Ange lösenfrasen\n"
 
-#: ../g10/passphrase.c:375
+#: g10/passphrase.c:375
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: ../g10/passphrase.c:380
-#: ../g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: ../g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5529,17 +5340,17 @@ msgstr ""
 "Du behöver en lösenfras för att låsa upp den hemliga\n"
 "nyckeln för användaren: \"%s\"\n"
 
-#: ../g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
 
-#: ../g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (undernyckel på primärt nyckel-id %s)"
 
-#: ../g10/photoid.c:74
+#: g10/photoid.c:74
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -5553,131 +5364,116 @@ msgstr ""
 "en mycket stor bild, så blir din nyckel också väldigt stor!\n"
 "Försök att använda en bild som har ungefär  formatet 240x288 pixlar.\n"
 
-#: ../g10/photoid.c:96
+#: g10/photoid.c:96
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Skriv JPEG-filnamnet för foto-id: "
 
-#: ../g10/photoid.c:117
+#: g10/photoid.c:117
 #, c-format
 msgid "unable to open JPEG file `%s': %s\n"
 msgstr "kunde inte öppna JPEG-filen \"%s\": %s\n"
 
-#: ../g10/photoid.c:128
+#: g10/photoid.c:128
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Den här JPEG-bilden är verkligen stor (%d byte)!\n"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: ../g10/photoid.c:130
+#: g10/photoid.c:130
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Vill du verkligen använda den? (j/N)? "
 
-#: ../g10/photoid.c:147
+#: g10/photoid.c:147
 #, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "\"%s\" är inte en JPEG-fil\n"
 
-#: ../g10/photoid.c:166
+#: g10/photoid.c:166
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Är detta foto korrekt (j/N/a)? "
 
-#: ../g10/photoid.c:370
+#: g10/photoid.c:370
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-id!\n"
 
-#: ../g10/pkclist.c:62
-#: ../g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
 # känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
-#: ../g10/pkclist.c:64
-#: ../g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "Nyckeln är ersatt"
 
-#: ../g10/pkclist.c:66
-#: ../g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "Nyckeln har tappat sin säkerhet"
 
-#: ../g10/pkclist.c:68
-#: ../g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: ../g10/pkclist.c:70
-#: ../g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
-#: ../g10/pkclist.c:74
+#: g10/pkclist.c:74
 msgid "reason for revocation: "
 msgstr "anledning för spärrning: "
 
-#: ../g10/pkclist.c:91
+#: g10/pkclist.c:91
 msgid "revocation comment: "
 msgstr "spärrningskommentar: "
 
 # ej kristallklart vad förkortningarna står för
-#. A string with valid answers.
-#.
-#. Note to translators: These are the allowed answers in lower and
-#. uppercase.  Below you will find the matching strings which
-#. should be translated accordingly and the letter changed to
-#. match the one in the answer string.
-#.
-#. i = please show me more information
-#. m = back to the main menu
-#. s = skip this key
-#. q = quit
-#.
-#: ../g10/pkclist.c:206
+#: g10/pkclist.c:206
 msgid "iImMqQsS"
 msgstr "iImMaAsS"
 
-#: ../g10/pkclist.c:214
+#: g10/pkclist.c:214
 msgid "No trust value assigned to:\n"
 msgstr "Inget tillitsvärde tilldelat till:\n"
 
-#: ../g10/pkclist.c:246
+#: g10/pkclist.c:246
 #, c-format
 msgid "  aka \"%s\"\n"
 msgstr "  även känd som \"%s\"\n"
 
-#: ../g10/pkclist.c:256
-msgid "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "Hur mycket litar du på att nyckeln faktiskt tillhör den angivna användaren?\n"
+#: g10/pkclist.c:256
+msgid ""
+"How much do you trust that this key actually belongs to the named user?\n"
+msgstr ""
+"Hur mycket litar du på att nyckeln faktiskt tillhör den angivna användaren?\n"
 
-#: ../g10/pkclist.c:271
+#: g10/pkclist.c:271
 #, c-format
 msgid "  %d = I don't know or won't say\n"
 msgstr "  %d = Jag vet inte eller kan inte säga något\n"
 
-#: ../g10/pkclist.c:273
+#: g10/pkclist.c:273
 #, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr "  %d = Jag litar INTE\n"
 
-#: ../g10/pkclist.c:279
+#: g10/pkclist.c:279
 #, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr "  %d = Jag litar förbehållslöst\n"
 
-#: ../g10/pkclist.c:285
+#: g10/pkclist.c:285
 msgid "  m = back to the main menu\n"
 msgstr "  m = gå tillbaka till huvudmenyn\n"
 
-#: ../g10/pkclist.c:288
+#: g10/pkclist.c:288
 msgid "  s = skip this key\n"
 msgstr "  s = hoppa över denna nyckel\n"
 
-#: ../g10/pkclist.c:289
+#: g10/pkclist.c:289
 msgid "  q = quit\n"
 msgstr "  q = avsluta\n"
 
-#: ../g10/pkclist.c:293
+#: g10/pkclist.c:293
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -5686,38 +5482,40 @@ msgstr ""
 "Minimum tillitsnivå för denna nyckel är: %s\n"
 "\n"
 
-#: ../g10/pkclist.c:299
-#: ../g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Vad väljer du? "
 
-#: ../g10/pkclist.c:320
+#: g10/pkclist.c:320
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
 msgstr "Vill du verkligen ge denna nyckel förbehållslöst förtroende? (j/N) "
 
-#: ../g10/pkclist.c:334
+#: g10/pkclist.c:334
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikat som leder till en nyckel med förbehållslöst förtroende:\n"
 
-#: ../g10/pkclist.c:419
+#: g10/pkclist.c:419
 #, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
-msgstr "%s: Det finns ingen försäkran om att nyckeln tillhör den angivna användaren\n"
+msgstr ""
+"%s: Det finns ingen försäkran om att nyckeln tillhör den angivna användaren\n"
 
-#: ../g10/pkclist.c:424
+#: g10/pkclist.c:424
 #, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
-msgstr "%s: Det finns en viss försäkran om att nyckeln tillhör den angivna användaren\n"
+msgstr ""
+"%s: Det finns en viss försäkran om att nyckeln tillhör den angivna "
+"användaren\n"
 
-#: ../g10/pkclist.c:430
+#: g10/pkclist.c:430
 msgid "This key probably belongs to the named user\n"
 msgstr "Den här nyckel tillhör antagligen den namngivna användaren\n"
 
-#: ../g10/pkclist.c:435
+#: g10/pkclist.c:435
 msgid "This key belongs to us\n"
 msgstr "Denna nyckel tillhör oss\n"
 
-#: ../g10/pkclist.c:461
+#: g10/pkclist.c:461
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5727,110 +5525,109 @@ msgstr ""
 "användaridentiteten. Om du *verkligen* vet vad du gör, kan du svara\n"
 "ja på nästkommande fråga.\n"
 
-#: ../g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "Vill du använda nyckeln ändå? (j/N) "
 
-#: ../g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
 
-#: ../g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "VARNING: denna nyckel kan ha spärrats (spärrnyckeln saknas)\n"
 
-#: ../g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: ../g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n"
 
-#: ../g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Detta kan betyda att signaturen är förfalskad.\n"
 
-#: ../g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
 
-#: ../g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Obs: Denna nyckel har stängts av.\n"
 
-#: ../g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "Observera: Validerad adress för signeraren är \"%s\"\n"
 
-#: ../g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "Observera: Signerarens adress \"%s\" matchar inte DNS-objektet\n"
 
-#: ../g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "trustlevel justerad till FULL på grund av giltig PKA-info\n"
 
-#: ../g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "trustlevel justerad till NEVER på grund av felaktig PKA-info\n"
 
-#: ../g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
 
-#: ../g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: ../g10/pkclist.c:604
-msgid "         There is no indication that the signature belongs to the owner.\n"
-msgstr "         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
+#: g10/pkclist.c:616
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
 
-#: ../g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
 
-#: ../g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen är sannolikt en FÖRFALSKNING.\n"
 
-#: ../g10/pkclist.c:621
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+#: g10/pkclist.c:633
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
 "tillräckligt högt tillitsvärde!\n"
 
-#: ../g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: ../g10/pkclist.c:822
-#: ../g10/pkclist.c:864
-#: ../g10/pkclist.c:1076
-#: ../g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppade över: %s\n"
 
 # överhoppad?
-#: ../g10/pkclist.c:834
-#: ../g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppades över: publik nyckel finns redan\n"
 
-#: ../g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Du angav ingen användaridentitet. (du kan använda \"-r\")\n"
 
-#: ../g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr "Nuvarande mottagare:\n"
 
-#: ../g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5838,29 +5635,29 @@ msgstr ""
 "\n"
 "Ange användaridentiteten.  Avsluta med en tom rad: "
 
-#: ../g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Ingen sådan användaridentitet.\n"
 
-#: ../g10/pkclist.c:969
-#: ../g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
-msgstr "hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
+msgstr ""
+"hoppade över: den publika nyckeln är redan inställd som standardmottagare\n"
 
-#: ../g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln är inaktiverad.\n"
 
-#: ../g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "hoppade över: publik nyckel redan angiven\n"
 
-#: ../g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "okänd standardmottagare \"%s\"\n"
 
-#: ../g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
@@ -5868,103 +5665,106 @@ msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
 # plural av adressee
 # dvs. den som meddelandet är adresserat till.
 # Åtskillnad görs mellan adressee och receiver.
-#: ../g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
-#: ../g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Observera: nyckeln %s har ingen %s-förmåga\n"
 
-#: ../g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
 
-#: ../g10/plaintext.c:91
+#: g10/plaintext.c:91
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
 
-#: ../g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Signatur i en separat fil.\n"
 
-#: ../g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: ../g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: ../g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: ../g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna signerat data \"%s\"\n"
 
-#: ../g10/pubkey-enc.c:107
+# se förra kommentaren
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "kan inte öppna signerat data \"%s\"\n"
+
+#: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonym mottagare; provar med den hemliga nyckeln %s ...\n"
 
-#: ../g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:138
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den hemliga mottagaren.\n"
 
-#: ../g10/pubkey-enc.c:226
+#: g10/pubkey-enc.c:227
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: ../g10/pubkey-enc.c:247
+#: g10/pubkey-enc.c:248
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "krypteringsalgoritmen %d%s är okänd eller inaktiverad\n"
 
-#: ../g10/pubkey-enc.c:285
+#: g10/pubkey-enc.c:286
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
+msgstr ""
+"VARNING: chifferalgoritmen %s hittades inte i mottagarinställningarna\n"
 
-#: ../g10/pubkey-enc.c:305
+#: g10/pubkey-enc.c:306
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "OBSERVERA: hemliga nyckeln %s gick ut %s\n"
 
-#: ../g10/pubkey-enc.c:311
+#: g10/pubkey-enc.c:312
 msgid "NOTE: key has been revoked"
 msgstr "OBSERVERA: nyckeln har spärrats"
 
 # Vad?
-#: ../g10/revoke.c:104
-#: ../g10/revoke.c:118
-#: ../g10/revoke.c:130
-#: ../g10/revoke.c:176
-#: ../g10/revoke.c:188
-#: ../g10/revoke.c:588
+#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
 
-#: ../g10/revoke.c:147
+#: g10/revoke.c:147
 #, c-format
 msgid "key %s has no user IDs\n"
 msgstr "nyckeln %s har inga användaridentiteter\n"
 
-#: ../g10/revoke.c:308
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Kommer att spärras av:\n"
 
-#: ../g10/revoke.c:312
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Detta är en känslig spärrnyckel)\n"
 
-#: ../g10/revoke.c:316
+#: g10/revoke.c:316
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
@@ -5973,56 +5773,52 @@ msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 # -do-not-force översatt med:
 # genomdriv inte
 # I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
-#: ../g10/revoke.c:329
-#: ../g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "utdata med ett ascii-skal genomdrivet.\n"
 
 # Vad menas???
-#: ../g10/revoke.c:344
-#: ../g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet misslyckades: %s\n"
 
-#. and issue a usage notice
-#: ../g10/revoke.c:407
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Spärrcertifikat skapat.\n"
 
-#: ../g10/revoke.c:413
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "inga spärrnycklar hittades för \"%s\"\n"
 
-#: ../g10/revoke.c:471
+#: g10/revoke.c:472
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 
-#: ../g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ingen motsvarande publik nyckel: %s\n"
 
-#: ../g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "publik nyckel passar inte ihop med den hemliga nyckeln!\n"
 
-#: ../g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
-#: ../g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "okänd krypteringsalgoritm\n"
 
-#: ../g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "OBS: Denna nyckel är oskyddad!\n"
 
-#. and issue a usage notice
-#: ../g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -6040,261 +5836,280 @@ msgstr ""
 "media blir oläsligt.  Men se upp:  Utskriftsfunktionen på\n"
 "din dator kan spara data så att det blir åtkomligt för andra!\n"
 
-#: ../g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Välj anledning till varför nyckeln spärras:\n"
 
-#: ../g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Troligen vill du välja %d här)\n"
 
-#: ../g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n"
 
-#: ../g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Anledning för spärrning: %s\n"
 
-#: ../g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(Ingen beskrivning angiven)\n"
 
-#: ../g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr "Är detta OK? (j/N) "
 
-#: ../g10/seckey-cert.c:57
+#: g10/seckey-cert.c:57
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
 
-#: ../g10/seckey-cert.c:63
+#: g10/seckey-cert.c:63
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "skyddsalgoritmen %d%s stöds inte\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: ../g10/seckey-cert.c:74
+#: g10/seckey-cert.c:74
 #, c-format
 msgid "protection digest %d is not supported\n"
 msgstr "skyddssammandraget %d stöds inte\n"
 
-#: ../g10/seckey-cert.c:293
+#: g10/seckey-cert.c:293
 msgid "Invalid passphrase; please try again"
 msgstr "Ogiltig lösenfras; försök igen"
 
-#: ../g10/seckey-cert.c:294
+#: g10/seckey-cert.c:294
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
 # För vissa krypteringsalgoritmer är det känt att vissa svaga nycklar kan förekomma. Dessa ska aldrig användas. GnuPG vill på detta sätt hindra dig från att skapa en sådan nyckel.
-#: ../g10/seckey-cert.c:363
+#: g10/seckey-cert.c:363
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenfras igen.\n"
 
-#: ../g10/seckey-cert.c:406
+#: g10/seckey-cert.c:406
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga nyckeln\n"
+msgstr ""
+"skapar den föråldrade 16-bit kontrollsumman för skydd av den hemliga "
+"nyckeln\n"
 
-#: ../g10/seskey.c:63
-#: ../sm/encrypt.c:121
+#: g10/seskey.c:63 sm/encrypt.c:121
 msgid "weak key created - retrying\n"
 msgstr "skapade en svag nyckel - försöker igen\n"
 
-#: ../g10/seskey.c:67
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "kan inte undvika en svag nyckel för symmetrisk kryptering; försökte\n"
 "%d gånger!\n"
 
-#: ../g10/seskey.c:229
+#: g10/seskey.c:229
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA kräver att hashlängden är multiplicerbar med 8 bitar\n"
 
-#: ../g10/seskey.c:243
+#: g10/seskey.c:242
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
 msgstr "DSA-nyckeln %s använder en osäker hash (%u bitar)\n"
 
-#: ../g10/seskey.c:255
+#: g10/seskey.c:254
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
 msgstr "DSA-nyckeln %s kräver en hash med %u bitar eller större\n"
 
-#. Sanity check that the md has a context for the hash that the
-#. sig is expecting.  This can happen if a onepass sig header does
-#. not match the actual sig, and also if the clearsign "Hash:"
-#. header is missing or does not match the actual sig.
-#: ../g10/sig-check.c:82
+#: g10/sig-check.c:82
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "VARNING: konflikt mellan signatursammandrag i meddelandet\n"
 
 # Vad betyder det?
-#: ../g10/sig-check.c:107
+#: g10/sig-check.c:107
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "VARNING: signeringsundernyckeln %s är inte korscertifierad\n"
 
 # cross-certification?
-#: ../g10/sig-check.c:119
+#: g10/sig-check.c:119
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "VARNING signeringsundernyckel  %s har en ogiltig korscertifiering\n"
 
 # behövs verkligen c-format här?
-#: ../g10/sig-check.c:191
+#: g10/sig-check.c:191
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgstr "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
 
-#: ../g10/sig-check.c:192
+#: g10/sig-check.c:192
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "den publika nyckeln %s är %lu sekunder nyare än signaturen\n"
 
 # c-format behövs inte i singularis
-#: ../g10/sig-check.c:203
+#: g10/sig-check.c:203
 #, c-format
-msgid "key %s was created %lu second in the future (time warp or clock problem)\n"
-msgstr "nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd klocka)\n"
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"nyckeln %s skapades %lu sekund in i framtiden (tidsresande eller felinställd "
+"klocka)\n"
 
-#: ../g10/sig-check.c:205
+#: g10/sig-check.c:205
 #, c-format
-msgid "key %s was created %lu seconds in the future (time warp or clock problem)\n"
-msgstr "nyckeln %s skapades %lu sekunder in i framtiden (tidsresande eller felinställd klocka)\n"
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"nyckeln %s skapades %lu sekunder in i framtiden (tidsresande eller "
+"felinställd klocka)\n"
 
-#: ../g10/sig-check.c:215
+#: g10/sig-check.c:215
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
 msgstr "OBSERVERA: signaturnyckeln %s gick ut %s\n"
 
-#: ../g10/sig-check.c:298
+#: g10/sig-check.c:298
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
-msgstr "antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
+msgstr ""
+"antar felaktig signatur från nyckeln %s på grund av en okänd kritisk bit\n"
 
-#: ../g10/sig-check.c:560
+#: g10/sig-check.c:560
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "nyckel %s: ingen undernyckel med spärrsignatur för undernyckel\n"
 
-#: ../g10/sig-check.c:587
+#: g10/sig-check.c:587
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "nyckeln %s: ingen undernyckel för signaturbindning av undernyckel\n"
 
 # notation data?
-#: ../g10/sign.c:86
+#: g10/sign.c:86
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "kan inte lägga till notationer i signaturer gjorda med en v3-nyckel\n"
 "(PGP 2.x-typ)\n"
 
-#: ../g10/sign.c:94
+#: g10/sign.c:94
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "kan inte lägga till notationer i nyckelsignaturer signaturer gjorda med en v3-nyckel (PGP 2.x-typ)\n"
+msgstr ""
+"kan inte lägga till notationer i nyckelsignaturer signaturer gjorda med en "
+"v3-nyckel (PGP 2.x-typ)\n"
 
-#: ../g10/sign.c:108
+#: g10/sign.c:108
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr "VARNING: kan inte %%-expandera anteckning (för stor).  Använder den utan expansion.\n"
+msgstr ""
+"VARNING: kan inte %%-expandera anteckning (för stor).  Använder den utan "
+"expansion.\n"
 
-#: ../g10/sign.c:125
+#: g10/sign.c:125
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "kan inte ange en policy-URL i v3 (PGP 2.x style) signaturer\n"
 
-#: ../g10/sign.c:133
+#: g10/sign.c:133
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "kan inte lägga till en policy-URL i signaturer gjorda med en v3-nyckel (PGP 2.x-typ)\n"
+msgstr ""
+"kan inte lägga till en policy-URL i signaturer gjorda med en v3-nyckel (PGP "
+"2.x-typ)\n"
 
-#: ../g10/sign.c:146
+#: g10/sign.c:146
 #, c-format
-msgid "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
-msgstr "VARNING: kunde inte %%-expandera policy-url (för stor).  Använder oexpanderad.\n"
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
+"VARNING: kunde inte %%-expandera policy-url (för stor).  Använder "
+"oexpanderad.\n"
 
-#: ../g10/sign.c:174
+#: g10/sign.c:174
 #, c-format
-msgid "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using unexpanded.\n"
-msgstr "VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för stor).  Använder oexpanderad.\n"
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
+"stor).  Använder oexpanderad.\n"
 
-#: ../g10/sign.c:347
+#: g10/sign.c:347
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
 
-#: ../g10/sign.c:356
+#: g10/sign.c:356
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signatur från: \"%s\"\n"
 
-#: ../g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n"
 "när du är i --pgp2-läge\n"
 
-#: ../g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
-msgid "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot mottagarinställningarna\n"
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
+"mottagarinställningarna\n"
 
-#: ../g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "signerar:"
 
-#: ../g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra klartextsignaturer med en PGP 2.x-nyckel\n"
 "när du är i --pgp2-läge\n"
 
-#: ../g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: ../g10/skclist.c:151
-#: ../g10/skclist.c:215
+#: g10/skclist.c:151 g10/skclist.c:215
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "nyckeln är inte markerad som osäker - det går inte att använda den med fejkad slumptalsgenerator!\n"
+msgstr ""
+"nyckeln är inte markerad som osäker - det går inte att använda den med "
+"fejkad slumptalsgenerator!\n"
 
-#: ../g10/skclist.c:182
+#: g10/skclist.c:182
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppade över \"%s\": förekommer flera gånger\n"
 
-#: ../g10/skclist.c:190
-#: ../g10/skclist.c:200
-#: ../g10/skclist.c:209
+#: g10/skclist.c:190 g10/skclist.c:200 g10/skclist.c:209
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: ../g10/skclist.c:195
+#: g10/skclist.c:195
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: ../g10/skclist.c:210
+#: g10/skclist.c:210
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
-msgstr "det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
+msgstr ""
+"det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
 
-#: ../g10/tdbdump.c:60
-#: ../g10/trustdb.c:366
+#: g10/tdbdump.c:60 g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: ../g10/tdbdump.c:105
+#: g10/tdbdump.c:105
 #, c-format
 msgid ""
 "# List of assigned trustvalues, created %s\n"
@@ -6303,242 +6118,227 @@ msgstr ""
 "# Skapat lista över tilldelade tillitsvärden %s\n"
 "# (Använd \"gpg --import-ownertrust\" för att återställa dem)\n"
 
-#: ../g10/tdbdump.c:160
-#: ../g10/tdbdump.c:168
-#: ../g10/tdbdump.c:173
-#: ../g10/tdbdump.c:178
+#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "fel i \"%s\": %s\n"
 
-#: ../g10/tdbdump.c:160
+#: g10/tdbdump.c:160
 msgid "line too long"
 msgstr "raden är för lång"
 
-#: ../g10/tdbdump.c:168
+#: g10/tdbdump.c:168
 msgid "colon missing"
 msgstr "kolon saknas"
 
-#: ../g10/tdbdump.c:174
+#: g10/tdbdump.c:174
 msgid "invalid fingerprint"
 msgstr "ogiltigt fingeravtryck"
 
-#: ../g10/tdbdump.c:179
+#: g10/tdbdump.c:179
 msgid "ownertrust value missing"
 msgstr "värde för ägartillit saknas"
 
-#. error
-#: ../g10/tdbdump.c:215
+#: g10/tdbdump.c:215
 #, c-format
 msgid "error finding trust record in `%s': %s\n"
 msgstr "fel vid sökning av tillitsvärde i \"%s\": %s\n"
 
-#: ../g10/tdbdump.c:219
+#: g10/tdbdump.c:219
 #, c-format
 msgid "read error in `%s': %s\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: ../g10/tdbdump.c:228
-#: ../g10/trustdb.c:381
+#: g10/tdbdump.c:228 g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: ../g10/tdbio.c:130
-#: ../g10/tdbio.c:1439
+#: g10/tdbio.c:130 g10/tdbio.c:1439
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: ../g10/tdbio.c:137
-#: ../g10/tdbio.c:1446
+#: g10/tdbio.c:137 g10/tdbio.c:1446
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 
-#: ../g10/tdbio.c:247
+#: g10/tdbio.c:247
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion för stor\n"
 
-#: ../g10/tdbio.c:500
+#: g10/tdbio.c:500
 #, c-format
 msgid "can't access `%s': %s\n"
 msgstr "kan inte komma åt \"%s\": %s\n"
 
-#: ../g10/tdbio.c:515
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: ../g10/tdbio.c:525
-#: ../g10/tdbio.c:548
-#: ../g10/tdbio.c:589
-#: ../sm/keydb.c:223
+#: g10/tdbio.c:525 g10/tdbio.c:548 g10/tdbio.c:589 sm/keydb.c:223
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "kan inte skapa lås för \"%s\"\n"
 
 # se förra kommentaren
-#: ../g10/tdbio.c:527
-#: ../g10/tdbio.c:592
+#: g10/tdbio.c:527 g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "kan inte låsa \"%s\"\n"
 
-#: ../g10/tdbio.c:553
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: ../g10/tdbio.c:557
+#: g10/tdbio.c:557
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
-#: ../g10/tdbio.c:560
+#: g10/tdbio.c:560
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
 
-#: ../g10/tdbio.c:602
+#: g10/tdbio.c:602
 msgid "NOTE: trustdb not writable\n"
 msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
 
-#: ../g10/tdbio.c:610
+#: g10/tdbio.c:610
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ogiltig tillitsdatabas\n"
 
-#: ../g10/tdbio.c:642
+#: g10/tdbio.c:642
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 
-#: ../g10/tdbio.c:650
+#: g10/tdbio.c:650
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: ../g10/tdbio.c:667
-#: ../g10/tdbio.c:687
-#: ../g10/tdbio.c:703
-#: ../g10/tdbio.c:717
-#: ../g10/tdbio.c:747
-#: ../g10/tdbio.c:1371
-#: ../g10/tdbio.c:1398
+#: g10/tdbio.c:667 g10/tdbio.c:687 g10/tdbio.c:703 g10/tdbio.c:717
+#: g10/tdbio.c:747 g10/tdbio.c:1371 g10/tdbio.c:1398
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid läsning av versionspost: %s\n"
 
-#: ../g10/tdbio.c:726
+#: g10/tdbio.c:726
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: ../g10/tdbio.c:1166
+#: g10/tdbio.c:1166
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: ../g10/tdbio.c:1175
+#: g10/tdbio.c:1175
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: ../g10/tdbio.c:1196
+#: g10/tdbio.c:1196
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: detta är inte en tillitsdatabasfil\n"
 
-#: ../g10/tdbio.c:1214
+#: g10/tdbio.c:1214
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: ../g10/tdbio.c:1219
+#: g10/tdbio.c:1219
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: ../g10/tdbio.c:1404
+#: g10/tdbio.c:1404
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid läsning av ledig post: %s\n"
 
-#: ../g10/tdbio.c:1412
+#: g10/tdbio.c:1412
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: ../g10/tdbio.c:1422
+#: g10/tdbio.c:1422
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: misslyckades med att nollställa en post: %s\n"
 
-#: ../g10/tdbio.c:1452
+#: g10/tdbio.c:1452
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: misslyckades med att lägga till en post: %s\n"
 
-#: ../g10/tdbio.c:1497
+#: g10/tdbio.c:1497
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n"
 
-#: ../g10/textfilter.c:149
+#: g10/textfilter.c:149
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "kan inte hantera text med rader längre än %d tecken\n"
 
-#: ../g10/textfilter.c:249
+#: g10/textfilter.c:249
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
 
-#: ../g10/trustdb.c:227
+#: g10/trustdb.c:227
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s ?r ingen giltig teckentabell\n"
 
 # trusted??
-#: ../g10/trustdb.c:258
+#: g10/trustdb.c:258
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "nyckel %s: accepterad som betrodd nyckel\n"
 
-#: ../g10/trustdb.c:296
+#: g10/trustdb.c:296
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nyckeln %s förekommer fler än en gång i tillitsdatabasen\n"
 
 # nyckeln?
-#: ../g10/trustdb.c:311
+#: g10/trustdb.c:311
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nyckel %s: ingen publik nyckel för pålitlig nyckel - hoppades över\n"
 
-#: ../g10/trustdb.c:321
+#: g10/trustdb.c:321
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "nyckeln %s är markerad med förbehållslöst förtroende.\n"
 
 # req står för request
 # kollat med Werner. Per
-#: ../g10/trustdb.c:345
+#: g10/trustdb.c:345
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n"
 
-#: ../g10/trustdb.c:351
+#: g10/trustdb.c:351
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
 
-#: ../g10/trustdb.c:447
+#: g10/trustdb.c:447
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
-msgstr "kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
+msgstr ""
+"kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
 
-#: ../g10/trustdb.c:453
+#: g10/trustdb.c:453
 #, c-format
 msgid "using %s trust model\n"
 msgstr "använder tillitsmodellen %s\n"
@@ -6552,125 +6352,128 @@ msgstr "använder tillitsmodellen %s\n"
 #    It gets passed to atoi() so everything after the number is
 #    essentially a comment and need not be translated.  Either key and
 #    uid are both NULL, or neither are NULL. */
-#: ../g10/trustdb.c:505
+#: g10/trustdb.c:505
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10"
 
-#: ../g10/trustdb.c:507
+#: g10/trustdb.c:507
 msgid "[ revoked]"
 msgstr "[ spärrad]"
 
-#: ../g10/trustdb.c:509
-#: ../g10/trustdb.c:514
+#: g10/trustdb.c:509 g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[ utgånget]"
 
-#: ../g10/trustdb.c:513
+#: g10/trustdb.c:513
 msgid "[ unknown]"
 msgstr "[ okänt]"
 
-#: ../g10/trustdb.c:515
+#: g10/trustdb.c:515
 msgid "[  undef ]"
 msgstr "[ odefinierad ]"
 
-#: ../g10/trustdb.c:516
+#: g10/trustdb.c:516
 msgid "[marginal]"
 msgstr "[marginell]"
 
-#: ../g10/trustdb.c:517
+#: g10/trustdb.c:517
 msgid "[  full  ]"
 msgstr "[  fullständig  ]"
 
-#: ../g10/trustdb.c:518
+#: g10/trustdb.c:518
 msgid "[ultimate]"
 msgstr "[förbehållslös]"
 
-#: ../g10/trustdb.c:533
+#: g10/trustdb.c:533
 msgid "undefined"
 msgstr "odefinierad"
 
-#: ../g10/trustdb.c:534
+#: g10/trustdb.c:534
 msgid "never"
 msgstr "aldrig"
 
-#: ../g10/trustdb.c:535
+#: g10/trustdb.c:535
 msgid "marginal"
 msgstr "marginell"
 
-#: ../g10/trustdb.c:536
+#: g10/trustdb.c:536
 msgid "full"
 msgstr "fullständig"
 
-#: ../g10/trustdb.c:537
+#: g10/trustdb.c:537
 msgid "ultimate"
 msgstr "förbehållslös"
 
-#: ../g10/trustdb.c:577
+#: g10/trustdb.c:577
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: ../g10/trustdb.c:583
-#: ../g10/trustdb.c:2352
+#: g10/trustdb.c:583 g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
 
-#: ../g10/trustdb.c:592
+#: g10/trustdb.c:592
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
-msgstr "det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
+msgstr ""
+"det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: ../g10/trustdb.c:607
+#: g10/trustdb.c:607
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
+msgstr ""
+"det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: ../g10/trustdb.c:839
-#: ../g10/trustdb.c:1277
+#: g10/trustdb.c:839 g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika nyckeln %s hittades inte: %s\n"
 
-#: ../g10/trustdb.c:1034
+#: g10/trustdb.c:1034
 msgid "please do a --check-trustdb\n"
 msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
 
 # originalet borde ha ett value
-#: ../g10/trustdb.c:1038
+#: g10/trustdb.c:1038
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: ../g10/trustdb.c:2095
+#: g10/trustdb.c:2095
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: ../g10/trustdb.c:2160
+#: g10/trustdb.c:2160
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: ../g10/trustdb.c:2174
+#: g10/trustdb.c:2174
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publik nyckel för förbehållslöst betrodda nyckeln %s hittades inte\n"
 
-#: ../g10/trustdb.c:2197
+#: g10/trustdb.c:2197
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(er) behövs, %d färdig(a) behövs, tillitsmodell %s\n"
 
-#: ../g10/trustdb.c:2283
+#: g10/trustdb.c:2283
 #, c-format
-msgid "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
-msgstr "djup: %d  giltig: %3d  signerad: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+"djup: %d  giltig: %3d  signerad: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: ../g10/trustdb.c:2358
+#: g10/trustdb.c:2358
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "kunde inte uppdatera versionspost i tillitsdatabasen: skrivning misslyckades: %s\n"
+msgstr ""
+"kunde inte uppdatera versionspost i tillitsdatabasen: skrivning "
+"misslyckades: %s\n"
 
-#: ../g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6680,49 +6483,53 @@ msgstr ""
 "Kom ihåg att signaturfilen (.sig eller .asc)\n"
 "ska vara den först angivna filen på kommandoraden\n"
 
-#: ../g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
-#: ../jnlib/logging.c:626
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "kan inte öppna \"%s\": %s\n"
+
+#: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: ../jnlib/utf8conv.c:71
+#: jnlib/utf8conv.c:71
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr "konvertering från \"%s\" till \"%s\" är inte tillgänglig\n"
 
-#: ../jnlib/utf8conv.c:79
+#: jnlib/utf8conv.c:79
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open misslyckades: %s\n"
 
-#: ../jnlib/utf8conv.c:331
-#: ../jnlib/utf8conv.c:597
+#: jnlib/utf8conv.c:331 jnlib/utf8conv.c:597
 #, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: ../kbx/kbxutil.c:86
+#: kbx/kbxutil.c:86
 msgid "set debugging flags"
 msgstr "ställ in felsökningsflaggor"
 
-#: ../kbx/kbxutil.c:87
+#: kbx/kbxutil.c:87
 msgid "enable full debugging"
 msgstr "aktivera fullständigt felsökningsläge"
 
-#: ../kbx/kbxutil.c:108
+#: kbx/kbxutil.c:108
 msgid "Please report bugs to "
 msgstr "Rapportera fel till "
 
-#: ../kbx/kbxutil.c:112
+#: kbx/kbxutil.c:112
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Användning: kbxutil [flaggor] [filer] (-h för hjälp)"
 
-#: ../kbx/kbxutil.c:115
+#: kbx/kbxutil.c:115
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "list, export, import Keybox data\n"
@@ -6730,83 +6537,80 @@ msgstr ""
 "Syntax: kbxutil [flaggor] [filer]\n"
 "lista, exportera, importera nyckelskåpsdata\n"
 
-#: ../scd/app-nks.c:345
+#: scd/app-nks.c:345
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN har ännu inte ändrats\n"
 
-#: ../scd/app-openpgp.c:601
+#: scd/app-openpgp.c:601
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 
-#: ../scd/app-openpgp.c:614
+#: scd/app-openpgp.c:614
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 
-#: ../scd/app-openpgp.c:1009
+#: scd/app-openpgp.c:1009
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
 
-#: ../scd/app-openpgp.c:1017
-#: ../scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: ../scd/app-openpgp.c:1025
-#: ../scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
-#: ../scd/app-openpgp.c:1034
-#: ../scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: ../scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "||Knappa in din PIN-kod på läsarens knappsats"
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Knappa in din PIN-kod på läsarens knappsats"
 
-#: ../scd/app-openpgp.c:1310
-#: ../scd/app-openpgp.c:1324
-#: ../scd/app-openpgp.c:1415
-#: ../scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-återanrop returnerade fel: %s\n"
 
-#: ../scd/app-openpgp.c:1331
-#: ../scd/app-openpgp.c:1421
-#: ../scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
 
-#: ../scd/app-openpgp.c:1342
-#: ../scd/app-openpgp.c:1356
-#: ../scd/app-openpgp.c:1431
-#: ../scd/app-openpgp.c:2262
-#: ../scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: ../scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: ../scd/app-openpgp.c:1394
-#: ../scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr "fel vid hämtning av CHV-status från kort\n"
 
-#: ../scd/app-openpgp.c:1400
-#: ../scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr "kortet är permanent låst!\n"
 
-#: ../scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanent\n"
@@ -6814,154 +6618,150 @@ msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanen
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: ../scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN-kod"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: ../scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: ../scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: ../scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: ../scd/app-openpgp.c:1615
-#: ../scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: ../scd/app-openpgp.c:1621
-#: ../scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: ../scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: ../scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr "befintlig nyckel kommer att ersättas\n"
 
-#: ../scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: ../scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: ../scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus saknar eller är inte %d bitar stor\n"
 
-#: ../scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
 
-#: ../scd/app-openpgp.c:1826
-#: ../scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
 
-#: ../scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att lagra nyckeln: %s\n"
 
-#: ../scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr "var god vänta under tiden nyckeln genereras ...\n"
 
-#: ../scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: ../scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
 
-#: ../scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
 
-#: ../scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
 
-#: ../scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: ../scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
-
-#: ../scd/app-openpgp.c:2500
-msgid "verification of Admin PIN is currently prohibited through this command\n"
-msgstr "validering av Admin PIN-kod är för närvarande förbjudet genom detta kommando\n"
+#: scd/app-openpgp.c:2543
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"validering av Admin PIN-kod är för närvarande förbjudet genom detta "
+"kommando\n"
 
-#: ../scd/app-openpgp.c:2573
-#: ../scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
 
-#: ../scd/scdaemon.c:107
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: ../scd/scdaemon.c:113
-#: ../sm/gpgsm.c:356
+#: scd/scdaemon.c:113 sm/gpgsm.c:356
 msgid "read options from file"
 msgstr "läs inställningar från fil"
 
-#: ../scd/scdaemon.c:123
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr "|N|anslut till läsare på port N"
 
-#: ../scd/scdaemon.c:124
+#: scd/scdaemon.c:124
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMN|använd NAMN som ct-API-drivrutin"
 
-#: ../scd/scdaemon.c:125
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMN|använd NAMN som PC/SC-drivrutin"
 
-#: ../scd/scdaemon.c:128
+#: scd/scdaemon.c:128
 msgid "do not use the internal CCID driver"
 msgstr "använd inte den interna CCID-drivrutinen"
 
-#. end --disable-ccid
-#: ../scd/scdaemon.c:133
+#: scd/scdaemon.c:133
 msgid "do not use a reader's keypad"
 msgstr "använd inte läsarens knappsats"
 
-#: ../scd/scdaemon.c:134
+#: scd/scdaemon.c:134
 msgid "allow the use of admin card commands"
 msgstr "tillåt användning av administratörskommandon för kort"
 
-#: ../scd/scdaemon.c:193
+#: scd/scdaemon.c:193
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Användning: scdaemon [flaggor] (-h för hjälp)"
 
-#: ../scd/scdaemon.c:195
+#: scd/scdaemon.c:195
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6969,218 +6769,206 @@ msgstr ""
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: ../scd/scdaemon.c:682
+#: scd/scdaemon.c:682
 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:1030
+#: scd/scdaemon.c:1030
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: ../scd/scdaemon.c:1035
+#: scd/scdaemon.c:1035
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
 
 # överhoppad eller hoppades över?
-#: ../sm/base64.c:318
+#: sm/base64.c:323
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
 
-#: ../sm/call-dirmngr.c:182
+#: sm/call-dirmngr.c:182
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "ingen körande dirmngr - startar \"%s\"\n"
 
-#: ../sm/call-dirmngr.c:216
+#: sm/call-dirmngr.c:216
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "miljövariabeln DIRMNGR_INFO är felformaterad\n"
 
-#: ../sm/call-dirmngr.c:228
+#: sm/call-dirmngr.c:228
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "dirmngr-protokoll version %d stöds inte\n"
 
-#: ../sm/call-dirmngr.c:242
+#: sm/call-dirmngr.c:242
 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:159
+#: sm/certchain.c:165
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritiska certifikattillägget %s stöds inte"
 
-#: ../sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr "utfärdarens certifikat är inte markerat som en CA"
 
-#: ../sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr "kritisk markerad policy utan konfigurerade policier"
 
-#: ../sm/certchain.c:246
+#: sm/certchain.c:252
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "misslyckades med att öppna \"%s\": %s\n"
 
-#: ../sm/certchain.c:253
-#: ../sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr "observera: icke-kritisk certifikatpolicy tillåts inte"
 
-#: ../sm/certchain.c:257
-#: ../sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 msgid "certificate policy not allowed"
 msgstr "certifikatpolicy tillåts inte"
 
-#: ../sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr "slår upp utfärdare på extern plats\n"
 
-#: ../sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antal utfärdare som matchar: %d\n"
 
-#: ../sm/certchain.c:570
-#: ../sm/certchain.c:734
-#: ../sm/certchain.c:1260
-#: ../sm/decrypt.c:261
-#: ../sm/encrypt.c:342
-#: ../sm/sign.c:328
-#: ../sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 msgid "failed to allocated keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: ../sm/certchain.c:661
+#: sm/certchain.c:667
 msgid "certificate has been revoked"
 msgstr "certifikatet har spärrats"
 
-#: ../sm/certchain.c:670
+#: sm/certchain.c:676
 msgid "no CRL found for certificate"
 msgstr "ingen spärrlista hittades för certifikatet"
 
-#: ../sm/certchain.c:674
+#: sm/certchain.c:680
 msgid "the available CRL is too old"
 msgstr "den tillgängliga spärrlistan är för gammal"
 
-#: ../sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "se till att \"dirmngr\" är korrekt installerat\n"
 
-#: ../sm/certchain.c:681
+#: sm/certchain.c:687
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontroll mot spärrlistan misslyckades: %s"
 
-#: ../sm/certchain.c:759
+#: sm/certchain.c:765
 msgid "no issuer found in certificate"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: ../sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikat med ogiltig giltighet: %s"
 
-#: ../sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr "certifikatet är ännu inte giltigt"
 
-#: ../sm/certchain.c:815
+#: sm/certchain.c:821
 msgid "certificate has expired"
 msgstr "certifikatet har gått ut"
 
-#: ../sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr "självsignerat certifikat har en FELAKTIG signatur"
 
-#: ../sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr "rotcertifikatet har inte markerats som betrott"
 
-#: ../sm/certchain.c:941
+#: sm/certchain.c:947
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtryck=%s\n"
 
-#: ../sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rotcertifikatet har nu markerats som betrott\n"
 
-#: ../sm/certchain.c:964
+#: sm/certchain.c:970
 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:970
+#: sm/certchain.c:976
 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:980
+#: sm/certchain.c:986
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: ../sm/certchain.c:1007
-#: ../sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "certifikatkedjan är för lång\n"
 
-#: ../sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: ../sm/certchain.c:1052
+#: sm/certchain.c:1058
 msgid "certificate has a BAD signature"
 msgstr "certifikatet har en FELAKTIG signatur"
 
-#: ../sm/certchain.c:1082
+#: sm/certchain.c:1088
 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:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certifikatkedjan längre än vad som tillåts av CA (%d)"
 
-#: ../sm/certcheck.c:52
+#: sm/certcheck.c:52
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA kräver användning av en 160-bitars hashalgoritm\n"
 
-#: ../sm/certcheck.c:177
-#: ../sm/sign.c:482
-#: ../sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(det här är MD2-algoritmen)\n"
 
-#: ../sm/certdump.c:61
-#: ../sm/certdump.c:147
+#: sm/certdump.c:68 sm/certdump.c:154
 msgid "none"
 msgstr "ingen"
 
-#: ../sm/certdump.c:156
+#: sm/certdump.c:163
 msgid "[none]"
 msgstr "[ingen]"
 
-#: ../sm/certdump.c:529
-#: ../sm/certdump.c:592
+#: sm/certdump.c:536 sm/certdump.c:599
 msgid "[Error - invalid encoding]"
 msgstr "[Fel - ogiltig kodning]"
 
-#: ../sm/certdump.c:537
+#: sm/certdump.c:544
 msgid "[Error - out of core]"
 msgstr "[Fel - slut på kärna]"
 
-#: ../sm/certdump.c:572
+#: sm/certdump.c:579
 msgid "[Error - No name]"
 msgstr "[Fel - Inget namn]"
 
-#: ../sm/certdump.c:597
+#: sm/certdump.c:604
 msgid "[Error - invalid DN]"
 msgstr "[Fel - ogiltigt DN]"
 
-#: ../sm/certdump.c:811
+#: sm/certdump.c:818
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for:\n"
@@ -7191,313 +6979,299 @@ msgstr ""
 "\"%s\"\n"
 "Serienummer %s, id %08lX, skapad %s"
 
-#: ../sm/certlist.c:125
+#: sm/certlist.c:125
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen nyckelanvändning angiven - antar alla användningsområden\n"
 
-#: ../sm/certlist.c:135
-#: ../sm/keylist.c:255
+#: sm/certlist.c:135 sm/keylist.c:255
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
 
-#: ../sm/certlist.c:145
+#: sm/certlist.c:145
 msgid "certificate should have not been used for certification\n"
 msgstr "certifikatet skulle inte använts för certifiering\n"
 
-#: ../sm/certlist.c:157
+#: sm/certlist.c:157
 msgid "certificate should have not been used for OCSP response signing\n"
 msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
 
-#: ../sm/certlist.c:168
+#: sm/certlist.c:168
 msgid "certificate should have not been used for encryption\n"
 msgstr "certifikatet skulle inte använts för kryptering\n"
 
-#: ../sm/certlist.c:169
+#: sm/certlist.c:169
 msgid "certificate should have not been used for signing\n"
 msgstr "certifikatet skulle inte använts för signering\n"
 
-#: ../sm/certlist.c:170
+#: sm/certlist.c:170
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikatet är inte användbart för kryptering\n"
 
-#: ../sm/certlist.c:171
+#: sm/certlist.c:171
 msgid "certificate is not usable for signing\n"
 msgstr "certifikatet är inte användbart för signering\n"
 
-#: ../sm/certreqgen.c:476
+#: sm/certreqgen.c:476
 #, c-format
 msgid "line %d: invalid algorithm\n"
 msgstr "rad %d: ogiltig algoritm\n"
 
-#: ../sm/certreqgen.c:489
+#: sm/certreqgen.c:489
 #, c-format
 msgid "line %d: invalid key length %u (valid are %d to %d)\n"
 msgstr "rad %d: ogiltig nyckellängd %u (giltiga är %d till %d)\n"
 
-#: ../sm/certreqgen.c:507
+#: sm/certreqgen.c:507
 #, c-format
 msgid "line %d: no subject name given\n"
 msgstr "rad %d: inget ämnesnamn angivit\n"
 
-#: ../sm/certreqgen.c:516
+#: sm/certreqgen.c:516
 #, c-format
 msgid "line %d: invalid subject name label `%.*s'\n"
 msgstr "rad %d: ogiltig ämnesnamnsetikett \"%.*s\"\n"
 
-#: ../sm/certreqgen.c:519
+#: sm/certreqgen.c:519
 #, c-format
 msgid "line %d: invalid subject name `%s' at pos %d\n"
 msgstr "rad %d: ogiltigt ämnesnamn \"%s\" på position %d\n"
 
-#: ../sm/certreqgen.c:536
+#: sm/certreqgen.c:536
 #, c-format
 msgid "line %d: not a valid email address\n"
 msgstr "rad %d: inte en giltig e-postadress\n"
 
-#: ../sm/certreqgen.c:548
+#: sm/certreqgen.c:548
 #, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "rad %d: fel vid läsning av nyckeln \"%s\" från kortet: %s\n"
 
 # keygrip (i.e. a hash over the public key
 # parameters) formatted as a hex string.
-#: ../sm/certreqgen.c:560
+#: sm/certreqgen.c:560
 #, c-format
 msgid "line %d: error getting key by keygrip `%s': %s\n"
 msgstr "rad %d: fel vid hämtning av nyckelhashen \"%s\": %s\n"
 
-#: ../sm/certreqgen.c:576
+#: sm/certreqgen.c:576
 #, c-format
 msgid "line %d: key generation failed: %s\n"
 msgstr "rad %d: nyckelgenerering misslyckades: %s\n"
 
-#: ../sm/decrypt.c:326
+#: sm/decrypt.c:326
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(det här är RC2-algoritmen)\n"
 
-#: ../sm/decrypt.c:328
+#: sm/decrypt.c:328
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(det här verkar inte vara ett krypterat meddelande)\n"
 
-#: ../sm/delete.c:52
-#: ../sm/delete.c:103
+#: sm/delete.c:52 sm/delete.c:103
 #, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "certifikatet \"%s\" hittades inte: %s\n"
 
-#: ../sm/delete.c:113
-#: ../sm/keydb.c:1392
-#: ../sm/keydb.c:1485
+#: sm/delete.c:113 sm/keydb.c:1392 sm/keydb.c:1485
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "fel vid låsning av nyckelskåp: %s\n"
 
-#: ../sm/delete.c:134
+#: sm/delete.c:134
 #, c-format
 msgid "duplicated certificate `%s' deleted\n"
 msgstr "dubblett av certifikatet \"%s\" borttaget\n"
 
-#: ../sm/delete.c:136
+#: sm/delete.c:136
 #, c-format
 msgid "certificate `%s' deleted\n"
 msgstr "certifikatet \"%s\" togs bort\n"
 
-#: ../sm/delete.c:166
+#: sm/delete.c:166
 #, c-format
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 
-#: ../sm/encrypt.c:333
+#: sm/encrypt.c:334
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
 
-#: ../sm/export.c:562
-#: ../sm/export.c:578
-#: ../sm/import.c:525
-#: ../sm/import.c:550
+#: sm/export.c:562 sm/export.c:578 sm/import.c:525 sm/import.c:550
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "fel vid skapandet av temporärfil: %s\n"
 
-#: ../sm/export.c:569
-#: ../sm/import.c:533
+#: sm/export.c:569 sm/import.c:533
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "fel vid skrivning till temporärfil: %s\n"
 
-#: ../sm/gpgsm.c:243
+#: sm/gpgsm.c:243
 msgid "|[FILE]|make a signature"
 msgstr "|[FIL]|skapa en signatur"
 
-#: ../sm/gpgsm.c:244
+#: sm/gpgsm.c:244
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[FIL]|skapa en klartext-signatur"
 
-#: ../sm/gpgsm.c:252
+#: sm/gpgsm.c:252
 msgid "list external keys"
 msgstr "lista externa nycklar"
 
-#: ../sm/gpgsm.c:254
+#: sm/gpgsm.c:254
 msgid "list certificate chain"
 msgstr "lista certifikatkedja"
 
-#: ../sm/gpgsm.c:257
+#: sm/gpgsm.c:257
 msgid "remove key from the public keyring"
 msgstr "ta bort nyckel från den publika nyckelringen"
 
-#: ../sm/gpgsm.c:260
+#: sm/gpgsm.c:260
 msgid "import certificates"
 msgstr "importera certifikat"
 
-#: ../sm/gpgsm.c:261
+#: sm/gpgsm.c:261
 msgid "export certificates"
 msgstr "exportera certifikat"
 
-#: ../sm/gpgsm.c:262
+#: sm/gpgsm.c:262
 msgid "register a smartcard"
 msgstr "registrera ett smartkort"
 
-#: ../sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr "kör i serverläge"
-
-#: ../sm/gpgsm.c:264
+#: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: ../sm/gpgsm.c:266
+#: sm/gpgsm.c:266
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: ../sm/gpgsm.c:267
+#: sm/gpgsm.c:267
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: ../sm/gpgsm.c:282
+#: sm/gpgsm.c:282
 msgid "create base-64 encoded output"
 msgstr "skapa base-64-kodat utdata"
 
-#: ../sm/gpgsm.c:284
+#: sm/gpgsm.c:284
 msgid "assume input is in PEM format"
 msgstr "anta att inmatning är i PEM-format"
 
-#: ../sm/gpgsm.c:286
+#: sm/gpgsm.c:286
 msgid "assume input is in base-64 format"
 msgstr "anta att inmatning är i base-64-format"
 
-#: ../sm/gpgsm.c:288
+#: sm/gpgsm.c:288
 msgid "assume input is in binary format"
 msgstr "anta att inmatning är i binärformat"
 
-#: ../sm/gpgsm.c:293
+#: sm/gpgsm.c:293
 msgid "use system's dirmngr if available"
 msgstr "använd systemets dirmngr om tillgängligt"
 
-#: ../sm/gpgsm.c:294
+#: sm/gpgsm.c:294
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: ../sm/gpgsm.c:301
+#: sm/gpgsm.c:301
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: ../sm/gpgsm.c:304
+#: sm/gpgsm.c:304
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikat att inkludera"
 
-#: ../sm/gpgsm.c:307
+#: sm/gpgsm.c:307
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: ../sm/gpgsm.c:310
+#: sm/gpgsm.c:310
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: ../sm/gpgsm.c:314
+#: sm/gpgsm.c:314
 msgid "fetch missing issuer certificates"
 msgstr "hämta saknade utfärdarcertifikat"
 
-#: ../sm/gpgsm.c:318
+#: sm/gpgsm.c:318
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
-#: ../sm/gpgsm.c:320
+#: sm/gpgsm.c:320
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som standardmottagare"
 
-#: ../sm/gpgsm.c:337
+#: sm/gpgsm.c:337
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: ../sm/gpgsm.c:341
+#: sm/gpgsm.c:341
 msgid "force v3 signatures"
 msgstr "tvinga v3-signaturer"
 
-#: ../sm/gpgsm.c:342
+#: sm/gpgsm.c:342
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#. { oUseAgent, "use-agent",0, N_("use the gpg-agent")},
-#: ../sm/gpgsm.c:347
+#: sm/gpgsm.c:347
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: ../sm/gpgsm.c:348
+#: sm/gpgsm.c:348
 msgid "assume yes on most questions"
 msgstr "anta ja på de flest frågorna"
 
-#: ../sm/gpgsm.c:349
+#: sm/gpgsm.c:349
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: ../sm/gpgsm.c:351
+#: sm/gpgsm.c:351
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan över nyckelringar"
 
-#: ../sm/gpgsm.c:352
+#: sm/gpgsm.c:352
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: ../sm/gpgsm.c:353
+#: sm/gpgsm.c:353
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: ../sm/gpgsm.c:354
+#: sm/gpgsm.c:354
 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:355
+#: sm/gpgsm.c:355
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|ställ in terminalteckentabell till NAMN"
 
-#: ../sm/gpgsm.c:359
+#: sm/gpgsm.c:359
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
-#: ../sm/gpgsm.c:374
+#: sm/gpgsm.c:374
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|läs in tilläggsmodulen FIL"
 
-#: ../sm/gpgsm.c:380
+#: sm/gpgsm.c:380
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: ../sm/gpgsm.c:382
+#: sm/gpgsm.c:382
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd sammandragsalgoritmen NAMN"
 
-#: ../sm/gpgsm.c:384
+#: sm/gpgsm.c:384
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: ../sm/gpgsm.c:520
+#: sm/gpgsm.c:520
 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:523
+#: sm/gpgsm.c:523
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7507,153 +7281,164 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: ../sm/gpgsm.c:617
+#: sm/gpgsm.c:617
 msgid "usage: gpgsm [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: ../sm/gpgsm.c:698
+#: sm/gpgsm.c:698
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "kan inte kryptera till \"%s\": %s\n"
 
-#: ../sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr "libksba är för gammal (behöver %s, har %s)\n"
 
-#: ../sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: ../sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: ../sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: ../sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr "det här kommandot har ännu inte implementerats\n"
 
-#: ../sm/import.c:110
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Välj vilken typ av nyckel som ska genereras:\n"
+
+#: sm/import.c:110
 #, c-format
 msgid "total number processed: %lu\n"
 msgstr "totalt antal behandlade: %lu\n"
 
-#: ../sm/import.c:227
+#: sm/import.c:227
 msgid "error storing certificate\n"
 msgstr "fel vid lagring av certifikat\n"
 
-#: ../sm/import.c:235
+#: sm/import.c:235
 msgid "basic certificate checks failed - not imported\n"
 msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
 
-#: ../sm/import.c:421
-#: ../sm/import.c:453
+#: sm/import.c:421 sm/import.c:453
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "fel vid importering av certifikat: %s\n"
 
-#: ../sm/import.c:542
-#: ../tools/gpg-connect-agent.c:384
+#: sm/import.c:542 tools/gpg-connect-agent.c:384
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
 
-#: ../sm/keydb.c:190
+#: sm/keydb.c:190
 #, c-format
 msgid "error creating keybox `%s': %s\n"
 msgstr "fel vid skapandet av nyckelskåpet \"%s\": %s\n"
 
-#: ../sm/keydb.c:193
+#: sm/keydb.c:193
 msgid "you may want to start the gpg-agent first\n"
 msgstr "du kanske vill starta gpg-agent först\n"
 
-#: ../sm/keydb.c:198
+#: sm/keydb.c:198
 #, c-format
 msgid "keybox `%s' created\n"
 msgstr "nyckelskåpet \"%s\" skapat\n"
 
-#: ../sm/keydb.c:1312
-#: ../sm/keydb.c:1378
+#: sm/keydb.c:1312 sm/keydb.c:1378
 msgid "failed to get the fingerprint\n"
 msgstr "misslyckades med att få fingeravtrycket\n"
 
-#: ../sm/keydb.c:1319
-#: ../sm/keydb.c:1385
+#: sm/keydb.c:1319 sm/keydb.c:1385
 msgid "failed to allocate keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: ../sm/keydb.c:1340
+#: sm/keydb.c:1340
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem vid sökandet efter befintligt certifikat: %s\n"
 
-#: ../sm/keydb.c:1348
+#: sm/keydb.c:1348
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "fel vid sökning efter skrivbar keyDB: %s\n"
 
-#: ../sm/keydb.c:1356
+#: sm/keydb.c:1356
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: ../sm/keydb.c:1400
+#: sm/keydb.c:1400
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
 
-#: ../sm/keydb.c:1409
-#: ../sm/keydb.c:1497
+#: sm/keydb.c:1409 sm/keydb.c:1497
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 
-#: ../sm/keydb.c:1418
-#: ../sm/keydb.c:1508
+#: sm/keydb.c:1418 sm/keydb.c:1508
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "fel vid lagring av flaggor: %s\n"
 
-#: ../sm/misc.c:57
+#: sm/misc.c:57
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
-msgstr "GPG_TTY har inte ställts in - använder kanske felaktigt standardvärde\n"
+msgstr ""
+"GPG_TTY har inte ställts in - använder kanske felaktigt standardvärde\n"
 
-#: ../sm/qualified.c:113
+#: sm/qualified.c:113
 #, c-format
 msgid "invalid formatted fingerprint in `%s', line %d\n"
 msgstr "ogiltigt formaterat fingeravtryck i \"%s\", rad %d\n"
 
-#: ../sm/qualified.c:131
+#: sm/qualified.c:131
 #, c-format
 msgid "invalid country code in `%s', line %d\n"
 msgstr "ogiltig landskod i \"%s\", rad %d\n"
 
-#: ../sm/qualified.c:224
+#: sm/qualified.c:224
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
 "\"%s\"\n"
-"This will create a qualified signature by law equated to a handwritten signature.\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
 "\n"
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 "Du är på väg att skapa en signatur med ditt certifikat:\n"
 "\"%s\"\n"
-"Det här kommer att skapa en kvalificerad signatur som kan likställas med en handskriven signatur.\n"
+"Det här kommer att skapa en kvalificerad signatur som kan likställas med en "
+"handskriven signatur.\n"
 "\n"
 "%s%sÄr du säker på att du vill göra det här?"
 
-#: ../sm/qualified.c:233
-msgid "Note, that this software is not officially approved to create or verify such signatures.\n"
-msgstr "Observera att den här programvaran inte officiellt godkänts för att skapa eller validera sådana signaturer.\n"
+#: sm/qualified.c:233
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
+msgstr ""
+"Observera att den här programvaran inte officiellt godkänts för att skapa "
+"eller validera sådana signaturer.\n"
 
-#: ../sm/qualified.c:321
+#: sm/qualified.c:321
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7662,61 +7447,60 @@ msgid ""
 msgstr ""
 "Du är på väg att skapa en signatur med ditt certifikat:\n"
 "\"%s\"\n"
-"Observera att det här certifikatet INTE kommer att skapa en kvalificerad signatur!"
+"Observera att det här certifikatet INTE kommer att skapa en kvalificerad "
+"signatur!"
 
-#: ../sm/sign.c:447
+#: sm/sign.c:447
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
 
-#: ../sm/verify.c:388
+#: sm/verify.c:388
 msgid "Signature made "
 msgstr "Signatur gjord "
 
-#: ../sm/verify.c:392
+#: sm/verify.c:392
 msgid "[date not given]"
 msgstr "[datum inte angivet]"
 
-#: ../sm/verify.c:393
+#: sm/verify.c:393
 #, c-format
 msgid " using certificate ID %08lX\n"
 msgstr " använder certificate-id %08lX\n"
 
-#: ../sm/verify.c:509
+#: sm/verify.c:509
 msgid "Good signature from"
 msgstr "Korrekt signatur från"
 
-#: ../sm/verify.c:510
+#: sm/verify.c:510
 msgid "                aka"
 msgstr "      även känd som"
 
-#: ../tools/gpg-connect-agent.c:60
-#: ../tools/gpgconf.c:64
-#: ../tools/symcryptrun.c:186
+#: tools/gpg-connect-agent.c:60 tools/gpgconf.c:64 tools/symcryptrun.c:186
 msgid "quiet"
 msgstr "tyst"
 
-#: ../tools/gpg-connect-agent.c:61
+#: tools/gpg-connect-agent.c:61
 msgid "print data out hex encoded"
 msgstr "skriv ut data hexkodat"
 
-#: ../tools/gpg-connect-agent.c:62
+#: tools/gpg-connect-agent.c:62
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
 
-#: ../tools/gpg-connect-agent.c:63
+#: tools/gpg-connect-agent.c:63
 msgid "run the Assuan server given on the command line"
 msgstr "kör Assuan-servern som angivits på kommandoraden"
 
-#: ../tools/gpg-connect-agent.c:65
+#: tools/gpg-connect-agent.c:65
 msgid "do not use extended connect mode"
 msgstr "använd inte utökat anslutningsläge"
 
-#: ../tools/gpg-connect-agent.c:126
+#: tools/gpg-connect-agent.c:126
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgstr "Användning: gpg-connect-agent [flaggor] (-h för hjälp)"
 
-#: ../tools/gpg-connect-agent.c:129
+#: tools/gpg-connect-agent.c:129
 msgid ""
 "Syntax: gpg-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -7724,144 +7508,130 @@ msgstr ""
 "Syntax: gpg-connect-agent [flaggor]\n"
 "Anslut till en körande agent och skicka kommandon\n"
 
-#: ../tools/gpg-connect-agent.c:324
+#: tools/gpg-connect-agent.c:324
 #, 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:333
+#: tools/gpg-connect-agent.c:333
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
 
-#: ../tools/gpg-connect-agent.c:391
+#: tools/gpg-connect-agent.c:391
 msgid "line too long - skipped\n"
 msgstr "raden är för lång - hoppades över\n"
 
-#: ../tools/gpg-connect-agent.c:395
+#: tools/gpg-connect-agent.c:395
 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:457
+#: tools/gpg-connect-agent.c:457
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "okänt kommando \"%s\"\n"
 
-#: ../tools/gpg-connect-agent.c:465
+#: 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:473
+#: 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:746
+#: tools/gpg-connect-agent.c:746
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
-#: ../tools/gpg-connect-agent.c:755
+#: tools/gpg-connect-agent.c:755
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
 
-#: ../tools/gpgconf-comp.c:437
-#: ../tools/gpgconf-comp.c:501
-#: ../tools/gpgconf-comp.c:568
-#: ../tools/gpgconf-comp.c:624
-#: ../tools/gpgconf-comp.c:696
+#: tools/gpgconf-comp.c:437 tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:568
+#: tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:696
 msgid "Options controlling the diagnostic output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: ../tools/gpgconf-comp.c:450
-#: ../tools/gpgconf-comp.c:514
-#: ../tools/gpgconf-comp.c:581
-#: ../tools/gpgconf-comp.c:637
-#: ../tools/gpgconf-comp.c:719
+#: tools/gpgconf-comp.c:450 tools/gpgconf-comp.c:514 tools/gpgconf-comp.c:581
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:719
 msgid "Options controlling the configuration"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: ../tools/gpgconf-comp.c:460
-#: ../tools/gpgconf-comp.c:539
-#: ../tools/gpgconf-comp.c:588
-#: ../tools/gpgconf-comp.c:647
-#: ../tools/gpgconf-comp.c:726
+#: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:539 tools/gpgconf-comp.c:588
+#: tools/gpgconf-comp.c:647 tools/gpgconf-comp.c:726
 msgid "Options useful for debugging"
 msgstr "Flaggor användbara för felsökning"
 
-#: ../tools/gpgconf-comp.c:465
-#: ../tools/gpgconf-comp.c:544
-#: ../tools/gpgconf-comp.c:593
-#: ../tools/gpgconf-comp.c:652
-#: ../tools/gpgconf-comp.c:734
+#: tools/gpgconf-comp.c:465 tools/gpgconf-comp.c:544 tools/gpgconf-comp.c:593
+#: tools/gpgconf-comp.c:652 tools/gpgconf-comp.c:734
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: ../tools/gpgconf-comp.c:473
-#: ../tools/gpgconf-comp.c:549
-#: ../tools/gpgconf-comp.c:660
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:549 tools/gpgconf-comp.c:660
 msgid "Options controlling the security"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: ../tools/gpgconf-comp.c:601
+#: tools/gpgconf-comp.c:601
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration för nyckelservrar"
 
-#: ../tools/gpgconf-comp.c:606
+#: tools/gpgconf-comp.c:606
 msgid "allow PKA lookups (DNS requests)"
 msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
 
-#: ../tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:665
 msgid "do not check CRLs for root certificates"
 msgstr "kontrollera inte spärrlistor för rotcertifikat"
 
-#: ../tools/gpgconf-comp.c:709
+#: tools/gpgconf-comp.c:709
 msgid "Options controlling the format of the output"
 msgstr "Flaggor som kontrollerar formatet på utdata"
 
-#: ../tools/gpgconf-comp.c:745
+#: tools/gpgconf-comp.c:745
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
 
-#: ../tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:755
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration för HTTP-servrar"
 
-#: ../tools/gpgconf-comp.c:766
+#: tools/gpgconf-comp.c:766
 msgid "use system's HTTP proxy setting"
 msgstr "använd systemets HTTP-proxyinställningar"
 
-#: ../tools/gpgconf-comp.c:771
+#: tools/gpgconf-comp.c:771
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration av LDAP-servrar som ska användas"
 
-#: ../tools/gpgconf-comp.c:808
+#: tools/gpgconf-comp.c:808
 msgid "Configuration for OCSP"
 msgstr "Konfiguration för OCSP"
 
-#: ../tools/gpgconf.c:56
+#: tools/gpgconf.c:56
 msgid "list all components"
 msgstr "lista alla komponenter"
 
-#: ../tools/gpgconf.c:57
+#: tools/gpgconf.c:57
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|lista flaggor"
 
-#: ../tools/gpgconf.c:58
+#: tools/gpgconf.c:58
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|ändra flaggor"
 
-#: ../tools/gpgconf.c:66
+#: tools/gpgconf.c:66
 msgid "activate changes at runtime, if possible"
 msgstr "aktivera ändringar vid körtid, om möjligt"
 
-#: ../tools/gpgconf.c:89
+#: tools/gpgconf.c:89
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: ../tools/gpgconf.c:92
+#: tools/gpgconf.c:92
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7869,24 +7639,24 @@ msgstr ""
 "Syntax: gpgconf [flaggor]\n"
 "Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
 
-#: ../tools/gpgconf.c:176
+#: tools/gpgconf.c:176
 msgid "usage: gpgconf [options] "
 msgstr "användning: gpgconf [flaggor] "
 
-#: ../tools/gpgconf.c:178
+#: tools/gpgconf.c:178
 msgid "Need one component argument"
 msgstr "Behöver ett komponentargument"
 
-#: ../tools/gpgconf.c:187
+#: tools/gpgconf.c:187
 msgid "Component not found"
 msgstr "Komponenten hittades inte"
 
-#: ../tools/no-libgcrypt.c:30
+#: tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
 
-#: ../tools/symcryptrun.c:173
+#: tools/symcryptrun.c:173
 msgid ""
 "@\n"
 "Commands:\n"
@@ -7896,175 +7666,172 @@ msgstr ""
 "Kommandon:\n"
 " "
 
-#: ../tools/symcryptrun.c:175
+#: tools/symcryptrun.c:175
 msgid "decryption modus"
 msgstr "dekrypteringsmodus"
 
-#: ../tools/symcryptrun.c:176
+#: tools/symcryptrun.c:176
 msgid "encryption modus"
 msgstr "krypteringsmodus"
 
-#: ../tools/symcryptrun.c:180
+#: tools/symcryptrun.c:180
 msgid "tool class (confucius)"
 msgstr "verktygsklass (confucius)"
 
-#: ../tools/symcryptrun.c:181
+#: tools/symcryptrun.c:181
 msgid "program filename"
 msgstr "programfilnamn"
 
-#: ../tools/symcryptrun.c:183
+#: tools/symcryptrun.c:183
 msgid "secret key file (required)"
 msgstr "hemlig nyckelfil (krävs)"
 
-#: ../tools/symcryptrun.c:184
+#: tools/symcryptrun.c:184
 msgid "input file name (default stdin)"
 msgstr "filnamn för inmatning (standardvärde är standard in)"
 
-#: ../tools/symcryptrun.c:228
+#: tools/symcryptrun.c:228
 msgid "Usage: symcryptrun [options] (-h for help)"
 msgstr "Användning: symcryptrun [flaggor] (-h för hjälp)"
 
-#: ../tools/symcryptrun.c:231
+#: tools/symcryptrun.c:231
 msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE [options...] COMMAND [inputfile]\n"
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
-"Syntax: symcryptrun --class KLASS --program PROGRAM --keyfile NYCKELFIL [flaggor...] KOMMANDO [inmatningsfil]\n"
+"Syntax: symcryptrun --class KLASS --program PROGRAM --keyfile NYCKELFIL "
+"[flaggor...] KOMMANDO [inmatningsfil]\n"
 "Anropa ett enkelt symmetriskt krypteringsverktyg\n"
 
-#: ../tools/symcryptrun.c:313
+#: tools/symcryptrun.c:313
 #, c-format
 msgid "%s on %s aborted with status %i\n"
 msgstr "%s på %s avbröts med status %i\n"
 
-#: ../tools/symcryptrun.c:320
+#: tools/symcryptrun.c:320
 #, c-format
 msgid "%s on %s failed with status %i\n"
 msgstr "%s på %s misslyckades med status %i\n"
 
-#: ../tools/symcryptrun.c:346
+#: tools/symcryptrun.c:346
 #, c-format
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
 
-#: ../tools/symcryptrun.c:386
-#: ../tools/symcryptrun.c:403
+#: tools/symcryptrun.c:386 tools/symcryptrun.c:403
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kunde inte öppna %s för skrivning: %s\n"
 
-#: ../tools/symcryptrun.c:414
+#: tools/symcryptrun.c:414
 #, c-format
 msgid "error writing to %s: %s\n"
 msgstr "fel vid skrivning till %s: %s\n"
 
-#: ../tools/symcryptrun.c:421
+#: tools/symcryptrun.c:421
 #, c-format
 msgid "error reading from %s: %s\n"
 msgstr "fel vid läsning från %s: %s\n"
 
-#: ../tools/symcryptrun.c:428
-#: ../tools/symcryptrun.c:435
+#: tools/symcryptrun.c:428 tools/symcryptrun.c:435
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: ../tools/symcryptrun.c:545
+#: tools/symcryptrun.c:545
 msgid "no --program option provided\n"
 msgstr "flaggan --program angavs inte\n"
 
-#: ../tools/symcryptrun.c:551
+#: tools/symcryptrun.c:551
 msgid "only --decrypt and --encrypt are supported\n"
 msgstr "endast --decrypt och --encrypt stöds\n"
 
-#: ../tools/symcryptrun.c:557
+#: tools/symcryptrun.c:557
 msgid "no --keyfile option provided\n"
 msgstr "flaggan --keyfile angavs inte\n"
 
-#: ../tools/symcryptrun.c:568
+#: tools/symcryptrun.c:568
 msgid "cannot allocate args vector\n"
 msgstr "kan inte allokera argumentvektor\n"
 
-#: ../tools/symcryptrun.c:586
+#: tools/symcryptrun.c:586
 #, c-format
 msgid "could not create pipe: %s\n"
 msgstr "kunde inte skapa rör: %s\n"
 
-#: ../tools/symcryptrun.c:593
+#: tools/symcryptrun.c:593
 #, c-format
 msgid "could not create pty: %s\n"
 msgstr "kunde inte skapa pty: %s\n"
 
-#: ../tools/symcryptrun.c:609
+#: tools/symcryptrun.c:609
 #, c-format
 msgid "could not fork: %s\n"
 msgstr "kunde inte grena process: %s\n"
 
-#: ../tools/symcryptrun.c:637
+#: tools/symcryptrun.c:637
 #, c-format
 msgid "execv failed: %s\n"
 msgstr "execv misslyckades: %s\n"
 
-#: ../tools/symcryptrun.c:666
+#: tools/symcryptrun.c:666
 #, c-format
 msgid "select failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: ../tools/symcryptrun.c:683
+#: tools/symcryptrun.c:683
 #, c-format
 msgid "read failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: ../tools/symcryptrun.c:735
+#: tools/symcryptrun.c:735
 #, c-format
 msgid "pty read failed: %s\n"
 msgstr "pty-läsning misslyckades: %s\n"
 
-#: ../tools/symcryptrun.c:787
+#: tools/symcryptrun.c:787
 #, c-format
 msgid "waitpid failed: %s\n"
 msgstr "waitpid misslyckades: %s\n"
 
-#: ../tools/symcryptrun.c:801
+#: tools/symcryptrun.c:801
 #, c-format
 msgid "child aborted with status %i\n"
 msgstr "barnprocess avbröts med status %i\n"
 
-#: ../tools/symcryptrun.c:856
+#: tools/symcryptrun.c:856
 #, c-format
 msgid "cannot allocate infile string: %s\n"
 msgstr "kan inte allokera infilssträng: %s\n"
 
-#: ../tools/symcryptrun.c:869
+#: tools/symcryptrun.c:869
 #, c-format
 msgid "cannot allocate outfile string: %s\n"
 msgstr "kan inte allokera utfilssträng: %s\n"
 
-#: ../tools/symcryptrun.c:1044
+#: tools/symcryptrun.c:1044
 #, c-format
 msgid "either %s or %s must be given\n"
 msgstr "antingen %s eller %s måste anges\n"
 
-#: ../tools/symcryptrun.c:1064
+#: tools/symcryptrun.c:1064
 msgid "no class provided\n"
 msgstr "ingen klass tillhandahölls\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#: ../tools/symcryptrun.c:1071
+#: tools/symcryptrun.c:1071
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "klassen %s stöds inte\n"
 
-#: ../scd/sc-copykeys.c:84
-msgid "Usage: sc-copykeys [options] (-h for help)\n"
-msgstr "Användning: sc-copykeys [flaggor] (-h för hjälp)\n"
-
-#: ../scd/sc-copykeys.c:86
-msgid ""
-"Syntax: sc-copykeys [options] file-with-key\n"
-"Copy keys to a smartcards\n"
-msgstr ""
-"Syntax: sc-copykeys [flaggor] fil-med-nyckel\n"
-"Kopierar nycklar till en smartkort\n"
+#~ msgid "Usage: sc-copykeys [options] (-h for help)\n"
+#~ msgstr "Användning: sc-copykeys [flaggor] (-h för hjälp)\n"
 
+#~ msgid ""
+#~ "Syntax: sc-copykeys [options] file-with-key\n"
+#~ "Copy keys to a smartcards\n"
+#~ msgstr ""
+#~ "Syntax: sc-copykeys [flaggor] fil-med-nyckel\n"
+#~ "Kopierar nycklar till en smartkort\n"
diff --git a/po/tr.po b/po/tr.po
index cb8c9c110..b69c4567d 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: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2006-11-04 03:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -36,31 +36,36 @@ msgstr ""
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 msgid "Passphrase"
 msgstr "Anahtar Parolası"
 
@@ -69,21 +74,21 @@ msgstr "Anahtar Parolası"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -154,25 +159,46 @@ msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "Anahtar parolasını giriniz\n"
+
+#: agent/genkey.c:146
 #, 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:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 msgid "Please re-enter this passphrase"
 msgstr "Lütfen bu anahtar parolasını tekrar girin"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr "aynı değiller - tekrar deneyin"
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 msgid ""
 "@Options:\n"
@@ -181,109 +207,109 @@ msgstr ""
 "@Seçenekler:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: 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:154
+#: 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:156
+#: agent/gpg-agent.c:158
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr "ssh-agent öykünümü etkinleşir"
 
-#: agent/gpg-agent.c:159
+#: 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:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 msgid "Please report bugs to <"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -291,136 +317,136 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken güvenli bellekte nüve dışına çıkıldı"
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, 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:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, 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:1373
+#: agent/gpg-agent.c:1379
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, 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:1480
+#: agent/gpg-agent.c:1486
 #, 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:1497
+#: agent/gpg-agent.c:1503
 #, 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:1502
+#: agent/gpg-agent.c:1508
 #, 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:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, 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:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -451,16 +477,16 @@ msgstr ""
 "Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
 "Gizli anahtar bakım aracı\n"
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -468,7 +494,7 @@ msgstr ""
 "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -476,16 +502,16 @@ msgstr ""
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
@@ -644,11 +670,11 @@ msgstr "gpg-agent ile haberleşme problemi\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "gpg-agent seçenekleri ayarlanırken sorun çıktı\n"
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 msgid "canceled by user\n"
 msgstr "kullanıcı tarafından iptal edildi\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 msgid "problem with the agent\n"
 msgstr "aracı ile sorun var\n"
 
@@ -712,75 +738,75 @@ msgstr "tT"
 msgid "cC"
 msgstr "iİ"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "zırh: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "zırh başlığı geçersiz: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "zırh başlığı: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "açıkça okunabilen imza başlığı geçersiz\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "açıkça okunabilen imzalar dahil edildi\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 msgid "unexpected armor: "
 msgstr "beklenmeyen zırh: "
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "araçizgisi escape'lı satır geçersiz: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "geçersiz radix64 karakteri %02X atlandı\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "dosya sonu belirsiz (CRC yok)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "dosya sonu belirsiz (CRC içinde)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "CRC bozulmuş\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hatası; %06lX - %06lX\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "kuyruk satırında hata\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "geçersiz zırh: satır %d karakterden uzun\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -833,8 +859,8 @@ 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:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
@@ -902,7 +928,7 @@ msgstr "genel anahtarın alınacağı URL: "
 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:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
@@ -1007,7 +1033,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
@@ -1027,7 +1053,7 @@ msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
@@ -1035,7 +1061,7 @@ msgstr "bu menüden çık"
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "bunu gösterir"
 
@@ -1087,7 +1113,7 @@ msgstr "PIN'i değiştirme veya engelleme menüsü"
 msgid "verify the PIN and list all data"
 msgstr "PIN'i doğrular ve tüm veriyi listeler"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "Komut> "
 
@@ -1103,27 +1129,27 @@ msgstr "Yönetici komutlarına izin verilir\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
@@ -1162,47 +1188,47 @@ msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "%s şifrelemesi kullanılıyor\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
 "yapabilirsiniz\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "tüm anahtarları şifrelemek için IDEA şifresi kullanılamaz.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
@@ -1210,7 +1236,7 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1219,38 +1245,38 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "şifreli paketin elde edilmesinde sorun var\n"
 
@@ -1337,40 +1363,40 @@ msgstr "ihraç sırasında anahtardan mümkün olduğunca çok şey kaldırılı
 msgid "export keys in an S-expression based format"
 msgstr "anahtarları bir S ifadesine dayalı biçimde ihraceder"
 
-#: g10/export.c:339
+#: g10/export.c:340
 msgid "exporting secret keys not allowed\n"
 msgstr "gizli anahtarların ihracına izin verilmez\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "anahtar %s: korunmamış - atlandı\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "anahtar %s: anahtar malzemesi kartta - atlandı\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr "korunmamış bir yardımcı anahtar ihraca hazır\n"
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "yardımcı anahtarın koruması kaldırılamadı: %s\n"
 
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
@@ -1394,7 +1420,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1410,7 +1436,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:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1418,127 +1444,131 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtarlıktan kaldırır"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtarlıktan kaldırır"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr "sunucu kipinde çalışır"
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1549,47 +1579,47 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 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:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 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:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1597,7 +1627,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1617,17 +1647,17 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Yazılım hatalarını lütfen <[email protected]> adresine,\n"
 "çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1637,7 +1667,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1645,545 +1675,545 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 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:1561
+#: g10/gpg.c:1565
 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:1563
+#: g10/gpg.c:1567
 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:1565
+#: g10/gpg.c:1569
 msgid "show the keyring name in key listings"
 msgstr "anahtar listelerinde anahtarlık ismini gösterir"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, 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:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, 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:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, 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:2472
+#: g10/gpg.c:2511
 #, 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:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 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:2562
+#: g10/gpg.c:2601
 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:2564
+#: g10/gpg.c:2603
 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:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 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:2575
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, 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:2759
+#: g10/gpg.c:2798
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, 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:2888
+#: g10/gpg.c:2927
 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:2894
+#: g10/gpg.c:2933
 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:2900
+#: g10/gpg.c:2939
 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:2913
+#: g10/gpg.c:2952
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 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:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 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:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 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:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, 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:3136
+#: g10/gpg.c:3175
 #, 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:3141
+#: g10/gpg.c:3180
 #, 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:3233
+#: g10/gpg.c:3272
 #, 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:3244
+#: g10/gpg.c:3283
 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:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, 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:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 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:3292
+#: g10/gpg.c:3341
 #, 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:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 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:3343
+#: g10/gpg.c:3392
 #, 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:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, 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:3517
+#: g10/gpg.c:3566
 #, 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:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -2561,92 +2591,92 @@ msgstr "ithalat sonrası anahtardan kullanışsız parçaları kaldırır"
 msgid "remove as much as possible from key after import"
 msgstr "ithalat sonrası anahtardan mümkün olduğunca çok şey kaldırır"
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d türündeki blok atlanıyor\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "şu ana kadar %lu anahtar işlendi\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "İşlenmiş toplam miktar: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      alınan: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   değişmedi: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             alınamadı: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    temizlenen imzalar: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     temizlenen kullanıcı kimlikleri: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2655,337 +2685,337 @@ msgstr ""
 "UYARI: anahtar %s bu kullanıcı kimliklerde kullanışsız algoritmalar için "
 "tercihler içeriyor:\n"
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": özümleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 "         \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
 "\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "tercihlerinizi güncellemenizi ve\n"
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
 "tekrar dağıtmanızı şiddetle öneririz.\n"
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %s: genel anahtar yok: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "anahtar %s: yeni anahtar - atlandı\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtarlık yok: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %s: \"%s\" değişmedi\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtarlık yok: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %s: gizli anahtar alındı\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "anahtar %s: zaten gizli anahtarlıkta\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "anahtar %s: gizli anahtar yok: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %s: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %s alınıyor\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
 
@@ -3094,12 +3124,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
@@ -3290,8 +3320,8 @@ msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -3302,19 +3332,19 @@ msgstr ""
 "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
 "değiştirilecek bir anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
@@ -3331,13 +3361,13 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3345,194 +3375,194 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 msgid "show key fingerprint"
 msgstr "parmakizini gösterir"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 msgid "select subkey N"
 msgstr "N yardımcı anahtarını"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 msgid "check signatures"
 msgstr "imzaları sınar"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs locally"
 msgstr "kullanıcı kimlikleri yerel olarak imzalar"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 msgid "delete selected user IDs"
 msgstr "seçili kullanıcı kimlikleri siler"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 msgid "add a subkey"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr "bir akıllı karta bir anahtar ekler"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr "bir akıllı karttan bir anahtarı taşır"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 msgid "delete selected subkeys"
 msgstr "seçili yardımcı anahtarları siler"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 msgid "delete signatures from the selected user IDs"
 msgstr "seçili kullanıcı kimliklerden imzaları siler"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
 "değiştirir"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr "seçili kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 msgid "toggle between the secret and public key listings"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 msgid "set preference list for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
 "belirler"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 msgid "set a notation for the selected user IDs"
 msgstr "seçili kullanıcı kimlikleri için bir simgelem belirler"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke signatures on the selected user IDs"
 msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "revoke selected user IDs"
 msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 msgid "enable key"
 msgstr "anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 msgid "disable key"
 msgstr "anahtarı iptal eder"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr "seçili foto kimlikleri gösterir"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "kullanışsız kullanıcı kimlikleri sıkıştırır ve kullanışsız imzaları "
 "anahtardan kaldırır"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "kullanışsız kullanıcı kimlikleri sıkıştırır ve tüm imzaları anahtardan "
 "kaldırır"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3544,239 +3574,239 @@ msgstr ""
 "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
 "(ltsign, tnrsign gibi).\n"
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "imza türü `%s' bilinmiyor\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr "Komut argüman olarak bir dosya ismi gerektiriyor\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 msgid "Really revoke this user ID? (y/N) "
 msgstr ""
 "Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr ""
 "Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
 "da y/N) "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 "Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 "(e/H ya da y/N) "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr ""
 "Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
 "sahibiningüvencesi belirlenemez\n"
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr "Belirlenecek tercih listesi:\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
 "musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 msgid "Notations: "
 msgstr "Simgelemler: "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3784,17 +3814,17 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3803,7 +3833,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3812,54 +3842,74 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "geçersiz"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
+
 #: g10/keyedit.c:3252
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
+
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3869,204 +3919,204 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
 "       kullanılamaz!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "yardımcı anahtar %s imzalamıyor, dolayısıyla çapraz sertifikalı olması "
 "gerekmiyor\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 msgid "Proceed? (y/N) "
 msgstr "Devam? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%s çittirmeli kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H veya "
 "y/N) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H "
 "veya y/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4108,12 +4158,12 @@ msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
@@ -4415,7 +4465,7 @@ msgstr ""
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4423,12 +4473,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4440,7 +4490,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4453,50 +4503,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtarlık yok: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtarlık yok: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4504,19 +4554,19 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4524,26 +4574,26 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "anahtarın kart üzerinde saklanması başarısız: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -4688,7 +4738,7 @@ msgstr "iptal edildi"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
@@ -4722,308 +4772,308 @@ msgstr "%2$s sunucusunda %1$s içindeki isimler aranıyor\n"
 msgid "searching for names from %s\n"
 msgstr "%s içindeki isimler aranıyor\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 msgid "no keyserver action!\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s  %d sürümü eylemciyi desteklemiyor\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 msgid "keyserver timed out\n"
 msgstr "anahtar sunucusu zamanaşımına uğradı\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu iç hatası\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "UYARI: Betimleyici %s çözümlenemiyor\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "bilinmeyen özümleme algoritması ile üretilmiş anahtar parolası %d\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
 "oluşturuldu\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 msgid "no signature found\n"
 msgstr "hiç imza yok\n"
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu belirsiz imza verisi elde edilemiyor\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature made %s\n"
 msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -5057,55 +5107,65 @@ msgstr "UYARI: deneysel %s özümleme algoritması kullanılıyor\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "UYARI: \"%s\" komutu artık önerilmiyor - kullanmayın onu\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
@@ -5162,7 +5222,7 @@ msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %s)"
@@ -5190,12 +5250,12 @@ msgstr "Anahtar parolasını giriniz\n"
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "aracı ile sorun var: %s\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5204,12 +5264,12 @@ msgstr ""
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \"%s\"\n"
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
@@ -5259,23 +5319,23 @@ msgstr "Bu foto doğru mu? (e/H/ç veya y/N/ç) "
 msgid "unable to display photo ID!\n"
 msgstr "foto kimliği gösterilemiyor!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "Belirtilmiş bir neden yok"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "Anahtar tehlikede"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "Anahtar artık kullanılmayacak"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
@@ -5342,7 +5402,7 @@ msgstr ""
 "Bu anahtar için asgari güvence seviyesi: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "Kararınız? "
 
@@ -5388,110 +5448,110 @@ msgstr ""
 "olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
 "sonraki soruya da evet cevabı verebilirsiniz.\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
 "UYARI: bu anahtar yürürlükten kaldırılmamış olabilir (yürürlükten kaldırma "
 "anahtarı mevcut değil)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "UYARI: Bu anahtar onu üreten tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         Bu imza sahte anlamına gelebilir.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "Bilgi: Bu anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "Bilgi: Doğrulanmış imzacının adresi: `%s'\n"
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "Bilgi: İmzacının adresi `%s', DNS girdisiyle eşleşmiyor\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "geçerli PKA bilgisinden dolayı güvence seviyesi TAM olarak ayarlandı\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "kötü PKA bilgisinden dolayı güvence seviyesi ASLA olarak ayarlandı\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Bu imza SAHTE olabilir.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
 "sertifikalanmamış!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğu kesin değil.\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: atlandı: genel anahtar zaten var\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr "Şimdiki alıcılar:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5499,42 +5559,42 @@ msgstr ""
 "\n"
 "Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "Genel anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
@@ -5543,27 +5603,32 @@ msgstr "anahtar %s: kullanıcı kimliği yok\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "Bağımsız imza.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "Lütfen veri dosyasının ismini girin: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "imzalı veri yok\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "imzalı veri '%s'  açılamadı\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5597,7 +5662,7 @@ msgid "NOTE: key has been revoked"
 msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet başarısız: %s\n"
@@ -5621,11 +5686,11 @@ msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
 "da y/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII zırhlı çıktı istendi.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet başarısız: %s\n"
@@ -5639,35 +5704,35 @@ msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "gizli anahtar \"%s\" yok: %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "karşılığı olan genel anahtar yok: `%s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 "Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
 "ya da y/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "bilinmeyen sıkıştırma algoritması\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "BİLGİ: Bu anahtar korunmamış!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5685,34 +5750,34 @@ msgstr ""
 "Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
 "bir kasada da muhafaza edebilirsiniz.\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "İptal"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Yürürlükten kaldırma sebebi: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(açıklama verilmedi)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr "Bu tamam mı? (e/H ya da y/N) "
 
@@ -5890,12 +5955,12 @@ msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s imza: \"%s\" den\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5903,17 +5968,17 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) özümleme algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
 "yapabilirsiniz\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -6293,7 +6358,7 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "güvence veritabanının sürüm kaydı güncellenemedi: yazma başarısız: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6303,11 +6368,16 @@ msgstr ""
 "İmza dosyasının (.sig veya .asc) komut satırında verilecek\n"
 "ilk dosya olması gerektiğini lütfen hatırlayın.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "`%s' açılamıyor: %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6371,53 +6441,62 @@ msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "genel anahtar okuması başarısız: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "bir okuyucu tuştakımı kullanılmaz"
+
+#: scd/app-openpgp.c:1330
 #, fuzzy
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
@@ -6426,108 +6505,107 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr "|A|Yönetici PIN'i"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr "oluşturum zaman damgası kayıp\n"
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modülü ya eksik ya da %d bitlik değil\n"
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA genel üstel sayısı ya eksik ya da %d bitten büyük\n"
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA asal sayısı %s ya eksik la da %d bitlik değil\n"
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kart %s özet algoritmasını desteklemiyor\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasaktır\n"
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -6592,7 +6670,7 @@ msgstr "fd %d için eylemci başlatıldı\n"
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "geçersiz radix64 karakteri %02x atlandı\n"
@@ -6615,131 +6693,131 @@ 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:159
+#: sm/certchain.c:165
 #, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "kritik sertifika eklentisi %s desteklenmiyor"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr "sertifikacı onu bir CA gibi imlememiş"
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr "yapılandırılmış poliçeler olmaksızın kritik imli poliçe"
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "`%s' açılamadı: %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr "bilgi: kritik olmayan sertifika poliçesine izin verilmez"
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 msgid "certificate policy not allowed"
 msgstr "sertifika poliçesine izin verilmiyor"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr "harici bir sertifikacı arar\n"
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "eşleşen sertifikacı sayısı: %d\n"
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 msgid "failed to allocated keyDB handle\n"
 msgstr "ayrılmış anahtar veritabanı elde edilemedi: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 msgid "certificate has been revoked"
 msgstr "sertifika yürürlükten kaldırılmıştı"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 msgid "no CRL found for certificate"
 msgstr "sertifika için bir CRL yok"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 msgid "the available CRL is too old"
 msgstr "mevcut CRL çok eski"
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 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:681
+#: sm/certchain.c:687
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "CRL sınaması başarısız: %s"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 msgid "no issuer found in certificate"
 msgstr "sertifikacı kim belli değil"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "geçersiz doğrulukla sertifika: %s"
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr "sertifika henüz geçersiz"
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 msgid "certificate has expired"
 msgstr "sertifika kullanım süresi dolmuş"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr "kök sertifika güvenilir olarak imli değil"
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "parmakizi=%s\n"
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 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:964
+#: sm/certchain.c:970
 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:970
+#: sm/certchain.c:976
 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:980
+#: sm/certchain.c:986
 #, 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:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "sertifika zinciri çok uzun\n"
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr "sertifikacı belli değil"
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 msgid "certificate has a BAD signature"
 msgstr "sertifika KÖTÜ bir imzaya sahip"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 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:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
@@ -6898,7 +6976,7 @@ msgstr "sertifika `%s' silindi\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "\"%s\" sertifikası silinemedi: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 msgid "no valid recipients given\n"
 msgstr "geçerli alıcılar verilmedi\n"
 
@@ -6944,10 +7022,6 @@ msgstr "sertifikaları ihraç eder"
 msgid "register a smartcard"
 msgstr "bir akıllı kartı kayda alır"
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr "sunucu kipinde çalışır"
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
@@ -7099,29 +7173,39 @@ msgstr "kullanımı: gpgsm [seçenekler] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "`%s'e şifrelenemez: %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr "libksba çok eski (gereken %s, sizinki %s)\n"
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr "bu komut henüz gerçeklenmedi\n"
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent bu oturumda kullanılamaz\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
+
 #: sm/import.c:110
 #, c-format
 msgid "total number processed: %lu\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 072706509..769938f81 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -37,36 +37,41 @@ msgid ""
 "this session"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有无效的字符\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "损坏的多精度整数(MPI)"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "错误的密码"
@@ -76,21 +81,21 @@ msgstr "错误的密码"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -161,29 +166,50 @@ msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "无论如何还是使用这把密钥吗？(y/N)"
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "请输入密码\n"
+
+#: agent/genkey.c:146
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密码"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -194,104 +220,104 @@ msgstr ""
 "选项：\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
@@ -300,148 +326,148 @@ msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -469,40 +495,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "错误的密码"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
@@ -660,12 +686,12 @@ msgstr ""
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "用户取消\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
@@ -730,75 +756,75 @@ msgstr "oO"
 msgid "cC"
 msgstr "cC"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII 封装：%s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "无效的 ASCII 封装头："
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "ASCII 封装头："
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "无效的明文签名头\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "多层明文签名\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 msgid "unexpected armor: "
 msgstr "与预期不符的 ASCII 封装："
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "以连字符开头的行格式错误："
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "文件先于预期结束(没有 CRC 部分)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "文件先于预期结束(CRC 部分未结束)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "异常的 CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 错误：%06lx - %06lx\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr "文件先于预期结束(于结尾处)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "结尾行有问题\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 数据。\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
@@ -848,8 +874,8 @@ msgstr "OpenPGP 卡不可用：%s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
@@ -917,7 +943,7 @@ msgstr "获取公钥的 URL："
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -1022,7 +1048,7 @@ msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
@@ -1042,7 +1068,7 @@ msgstr "私钥部分不可用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
@@ -1050,7 +1076,7 @@ msgstr "离开这个菜单"
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "显示这份在线说明"
 
@@ -1102,7 +1128,7 @@ msgstr "更改或解锁 PIN 的菜单"
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "命令> "
 
@@ -1118,27 +1144,27 @@ msgstr "允许使用管理员命令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "读取密钥区块时发生错误：%s\n"
@@ -1177,88 +1203,88 @@ msgstr "公钥“%s”有对应的私钥！\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "使用对称加密算法 %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "在 --pgp2 模式中，您只能使用 2048 位及以下的 RSA 密钥加密\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "正在从‘%s’读取\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "您正要用来加密的所有密钥都不能使用 IDEA 算法。\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "您不该将 %s 用于 %s 模式中\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "处理加密包有问题\n"
 
@@ -1341,41 +1367,41 @@ msgstr "导出时尽可能清除密钥中的可选部分"
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 msgid "exporting secret keys not allowed\n"
 msgstr "不允许导出私钥\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "密钥 %s：未被保护――已跳过\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "密钥 %s：密钥在卡上——已跳过\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr "准备导出一把不受保护的子钥\n"
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "无法取消保护子钥：%s\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
@@ -1398,7 +1424,7 @@ msgstr "自动获取‘%s’，通过 %s\n"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
@@ -1413,7 +1439,7 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1421,127 +1447,131 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "列出密钥和签名"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "为某把密钥添加签名"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签名"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签名"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1552,47 +1582,47 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1600,7 +1630,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1620,17 +1650,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1640,7 +1670,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1648,535 +1678,535 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2933
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2939
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2952
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3057
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3020
+#: g10/gpg.c:3059
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3175
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3141
+#: g10/gpg.c:3180
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -2539,351 +2569,351 @@ msgstr "导入后清除密钥中无用的部分"
 msgid "remove as much as possible from key after import"
 msgstr "导入后尽可能清除密钥中的可选部分"
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "跳过 %d 样式的区块\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目前已处理 %lu 把密钥\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "合计被处理的数量：%lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  已跳过的新密钥：%lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    遗失用户标识：%lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "          已导入：%lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          未改变：%lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      新用户标识：%lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "        新的子钥：%lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        新的签名：%lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    新的密钥吊销：%lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      读取的私钥：%lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "      导入的私钥：%lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    未改变的私钥：%lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        未被导入：%lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "      清除的签名：%lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  清除的用户标识：%lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n"
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”：对称加密算法 %s 对应首选项\n"
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥 %s：PKS 子钥破损已修复\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自身签名所致\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥――已跳过\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥“%s”已导入\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s”一个新的用户标识\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s”1 个新的签名\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s”%d 个新的签名\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s”1 个新的子钥\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s”未改变\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "密钥 %s：已在私钥钥匙环中\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "密钥 %s：找不到私钥：%s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签名没有用户标识\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子钥\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子钥绑定\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子钥绑定\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子钥吊销\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子钥吊销\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识“%s”\n"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子钥\n"
@@ -2892,65 +2922,65 @@ msgstr "密钥 %s：已跳过子钥\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已新增直接密钥签名\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "注意：密钥的序列号与卡的不符\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "注意：主钥在线，存储在卡上\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "注意：子钥在线，存储在卡上\n"
 
@@ -3058,12 +3088,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签名吗？(y/N)"
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签名。\n"
 
@@ -3241,8 +3271,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
@@ -3251,19 +3281,19 @@ msgstr "签名时失败： %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
@@ -3280,11 +3310,11 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3292,184 +3322,184 @@ msgstr ""
 "您不想要用密码――这大概是个坏主意！\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr "您真的想要这么做吗？(y/N)"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把密钥的签名移动到正确的位置去\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "保存并离开"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 msgid "show key fingerprint"
 msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 msgid "select subkey N"
 msgstr "选择子钥 N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 msgid "check signatures"
 msgstr "检查签名"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs locally"
 msgstr "为所选用户标识添加本地签名"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr "为所选用户标识添加信任签名"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "为所选用户标识添加不可吊销签名"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 msgid "delete selected user IDs"
 msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 msgid "add a subkey"
 msgstr "添加一个子钥"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr "将备份密钥转移到卡上"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 msgid "delete selected subkeys"
 msgstr "删除选定的子钥"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 msgid "delete signatures from the selected user IDs"
 msgstr "删除所选用户标识上的签名"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "变更密钥或所选子钥的使用期限"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr "将所选的用户标识设为首选用户标识"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 msgid "toggle between the secret and public key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 msgid "set preference list for the selected user IDs"
 msgstr "设定所选用户标识的首选项"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "设定所选用户标识的首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 msgid "set a notation for the selected user IDs"
 msgstr "为所选用户标识的设定注记"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke signatures on the selected user IDs"
 msgstr "吊销所选用户标识上的签名"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "revoke selected user IDs"
 msgstr "吊销选定的用户标识"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr "吊销密钥或选定的子钥"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 msgid "enable key"
 msgstr "启用密钥"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 msgid "disable key"
 msgstr "禁用密钥"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr "显示选定的照片标识"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "压缩不可用的用户标识并删除不可用的签名"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "压缩不可用的用户标识并删除所有签名"
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "读取私钥区块“%s”时出错：%s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "请先使用“toggle”指令。\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3480,245 +3510,245 @@ msgstr ""
 "  信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n"
 "  合(ltsign、tnrsign 等)。\n"
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签名吗？(y/N)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示：选择要添加签名的用户标识\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的签名类型‘%s’\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识！\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要删除所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要删除这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要删除主钥吗？(y/N)"
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr "您必须指定一把密钥。\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr "命令需要一个文件名作为参数\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "从‘%s’读取备份密钥时出错：%s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一把密钥。\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想要删除选定的密钥吗？(y/N)"
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除这把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "您真的要吊销整把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "您真的要吊销选定的子钥吗？(y/N)"
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这把子钥吗？(y/N)"
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr "设为首选项列表为：\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 msgid "Notations: "
 msgstr "注记："
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3727,54 +3757,74 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签名吗？(y/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "无效"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "用户标识“%s”：无用部分已清除\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "密钥 %s：“%s”%d 个签名被清除\n"
+
 #: g10/keyedit.c:3252
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "密钥 %s：“%s”%d 个签名被清除\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "用户标识“%s”：无用部分已清除\n"
+
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3783,193 +3833,193 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签名\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 msgid "Enter the notation: "
 msgstr "输入注记："
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N)"
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -4009,12 +4059,12 @@ msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
@@ -4312,7 +4362,7 @@ msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4320,12 +4370,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4337,7 +4387,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4347,50 +4397,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签名。\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4398,42 +4448,42 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
@@ -4577,7 +4627,7 @@ msgstr "已禁用"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
@@ -4611,304 +4661,304 @@ msgstr "在 %s 服务器 %s 上搜索名字\n"
 msgid "searching for names from %s\n"
 msgstr "在 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获取 URI %s：%s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "不能解析 URI %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密过的会话密钥尺寸(%d)诡异\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会话密钥\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：报文未受到完整的保护\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发件者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 msgid "no signature found\n"
 msgstr "未找到签名\n"
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "签名验证已被抑制\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理这些有歧义的签名\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签名建立于 %s\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于“%s”"
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于“%s”"
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于“%s”"
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签名\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
@@ -4942,55 +4992,65 @@ msgstr "警告：使用试验性质的散列算法 %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告：不建议使用散列算法 %s\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：不建议使用该选项“%s”\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "警告：“%s”选项已不建议使用\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "不压缩"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
@@ -5046,7 +5106,7 @@ msgstr "警告：潜在不安全的对称加密会话密钥\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主钥匙号 %s)"
@@ -5074,24 +5134,24 @@ msgstr "请输入密码\n"
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (主钥 %s 的子钥)"
@@ -5140,23 +5200,23 @@ msgstr "这张照片正确吗？(y/N/q)"
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "密钥被替换"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "密钥已泄漏"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "密钥不再使用"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "用户标识不再有效"
 
@@ -5223,7 +5283,7 @@ msgstr ""
 "这把密钥的最小信任等级为：%s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "您的决定是什么？"
 
@@ -5262,105 +5322,105 @@ msgstr ""
 "这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
 "己在做什么，您可以在下一个问题回答 yes。\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "无论如何还是使用这把密钥吗？(y/N)"
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告：正在使用不被信任的密钥！\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告：此密钥可能已被吊销(吊销密钥不存在)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告：这把密钥已经被它的指定吊销者吊销了！\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "警告：这把密钥已经被它的持有者吊销了！\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "      这表明这个签名有可能是伪造的。\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "警告：这把子钥已经被它的持有者吊销了！\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "注意：这把密钥已经被禁用了。\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr "注意：验证过的签名者的地址是‘%s’\n"
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr "注意：签名者的地址‘%s’不匹配任何 DNS 记录\n"
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr "PKA 信息有效，信任级别调整到“完全”\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr "PKA 信息无效，信任级别调整到“从不”\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "注意：这把密钥已经过期了！\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告：这把密钥未经受信任的签名认证！\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      没有证据表明这个签名属于它所声称的持有者。\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告：我们不信任这把密钥！\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      这个签名很有可能是伪造的。\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告：这把密钥未经有足够信任度的签名所认证。\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      这份签名并不一定属于它所声称的持有者\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s：已跳过：%s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳过：公钥已存在\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr "当前收件人：\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5368,42 +5428,42 @@ msgstr ""
 "\n"
 "输入用户标识。以空白行结束："
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "没有这个用户标识。\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "公钥被禁用。\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "已跳过：公钥已被设定\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的默认收件者“%s”\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s：已跳过：公钥已被禁用\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "没有有效的地址\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
@@ -5412,27 +5472,32 @@ msgstr "密钥 %s：没有有效的用户标识\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "数据未被保存；请用“--output”选项来保存它们\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "分离的签名。\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "请输入数据文件的名称： "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "正在从标准输入读取 ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "不含签名的数据\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "无法打开有签名的数据‘%s’\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5466,7 +5531,7 @@ msgid "NOTE: key has been revoked"
 msgstr "注意：密钥已被吊销"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失败：%s\n"
@@ -5488,11 +5553,11 @@ msgstr "(这是一把敏感的吊销密钥)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "已强行使用 ASCII 封装过的输出。\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失败： %s\n"
@@ -5506,33 +5571,33 @@ msgstr "已建立吊销证书。\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "没有找到“%s”的吊销密钥\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私钥“%s”：%s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "没有相对应的公钥：%s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "公钥与私钥不吻合！\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "未知的保护算法\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "注意：这把密钥没有被保护！\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5550,33 +5615,33 @@ msgstr ""
 "小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
 "人也能够看得到的地方！\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "请选择吊销的原因：\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也许您会想要在这里选择 %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "请输入描述(可选)；以空白行结束：\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "吊销原因：%s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(不给定描述)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr "这样可以吗？ (y/N)"
 
@@ -5734,25 +5799,25 @@ msgstr "检查已建立的签名时发生错误： %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签名\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签名\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
@@ -6127,7 +6192,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6137,11 +6202,16 @@ msgstr ""
 "请记住签名文件(.sig或.asc)\n"
 "应该是在命令行中给定的第一个文件。\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "无法打开‘%s’： %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6207,52 +6277,61 @@ msgstr "无法存储创建日期：%s\n"
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
@@ -6260,108 +6339,107 @@ msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr "|A|管理员 PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr "新的 PIN"
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "无法存储密钥：%s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡不支持散列算法 %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@ -6425,7 +6503,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
@@ -6449,139 +6527,139 @@ msgstr "不支持 gpg-agent 协议版本 %d\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "不允许导出私钥\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "无法存储密钥：%s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "注意：密钥已被吊销"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "证书已损坏"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "可用的密钥在："
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "生成一份吊销证书"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "这把密钥已经过期！"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "CA 指纹："
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "验证签名"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6744,7 +6822,7 @@ msgstr "首选项‘%s’重复\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(不给定描述)\n"
@@ -6799,10 +6877,6 @@ msgstr "证书已损坏"
 msgid "register a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -6967,29 +7041,39 @@ msgstr "用法：gpg [选项] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent 在此次舍话中无法使用\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "请选择您要使用的密钥种类：\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e817fb0e5..dc5f61ab4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
 "PO-Revision-Date: 2005-07-29 09:49+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -35,36 +35,41 @@ msgid ""
 "this session"
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有無效的字符\n"
 
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
 #, fuzzy
 msgid "Bad PIN"
 msgstr "損壞的 MPI"
 
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "錯誤的密語"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
 #, fuzzy
 msgid "Passphrase"
 msgstr "錯誤的密語"
@@ -74,21 +79,21 @@ msgstr "錯誤的密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
 #: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
 #: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -159,29 +164,50 @@ msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning:  You have entered a passphrase that%%0Ais obviously not secure.  A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "請輸入密語\n"
+
+#: agent/genkey.c:146
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Ato protect your new key"
 msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密語"
 
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
 #: tools/symcryptrun.c:487
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/genkey.c:218
+#: agent/genkey.c:265
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "更改密語"
 
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
 #: scd/scdaemon.c:103
 #, fuzzy
 msgid ""
@@ -192,252 +218,252 @@ msgstr ""
 "選項:\n"
 " "
 
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
 #: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
 #: tools/gpgconf.c:63 tools/symcryptrun.c:185
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
 #: sm/gpgsm.c:336
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
 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:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
 #: tools/symcryptrun.c:187
 #, 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:132
+#: agent/gpg-agent.c:133
 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:152
+#: agent/gpg-agent.c:154
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
 #: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
 #: tools/gpgconf.c:86 tools/symcryptrun.c:225
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
 #, c-format
 msgid "out of core in secure memory while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
 #, c-format
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
 #: tools/symcryptrun.c:1056
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
 #: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時發生錯誤: %s\n"
 
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
 #: g10/openfile.c:418 scd/scdaemon.c:932
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "目錄 `%s' 已建立\n"
 
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 失敗於 %s: %s\n"
 
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
 #: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -465,40 +491,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "請輸入密語; 這是一個秘密的句子 \n"
 
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
 #, fuzzy
 msgid "Passphrase:"
 msgstr "錯誤的密語"
 
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
@@ -656,12 +682,12 @@ msgstr ""
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "由使用者取消了\n"
 
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
@@ -726,75 +752,75 @@ msgstr "oO"
 msgid "cC"
 msgstr "cC"
 
-#: g10/armor.c:320
+#: g10/armor.c:368
 #, c-format
 msgid "armor: %s\n"
 msgstr "封裝: %s\n"
 
-#: g10/armor.c:359
+#: g10/armor.c:407
 msgid "invalid armor header: "
 msgstr "無效的封裝檔頭: "
 
-#: g10/armor.c:370
+#: g10/armor.c:418
 msgid "armor header: "
 msgstr "封裝檔頭: "
 
-#: g10/armor.c:381
+#: g10/armor.c:429
 msgid "invalid clearsig header\n"
 msgstr "無效的明文簽章檔頭\n"
 
-#: g10/armor.c:433
+#: g10/armor.c:481
 msgid "nested clear text signatures\n"
 msgstr "多層明文簽章\n"
 
-#: g10/armor.c:568
+#: g10/armor.c:616
 msgid "unexpected armor: "
 msgstr "未預期的封裝: "
 
-#: g10/armor.c:580
+#: g10/armor.c:628
 msgid "invalid dash escaped line: "
 msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無效的 64 進位字符 %02x 被跳過了\n"
 
-#: g10/armor.c:777
+#: g10/armor.c:825
 msgid "premature eof (no CRC)\n"
 msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
 
-#: g10/armor.c:811
+#: g10/armor.c:859
 msgid "premature eof (in CRC)\n"
 msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 
-#: g10/armor.c:819
+#: g10/armor.c:867
 msgid "malformed CRC\n"
 msgstr "CRC 被變造過\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 錯誤; %06lX - %06lX\n"
 
-#: g10/armor.c:843
+#: g10/armor.c:891
 msgid "premature eof (in trailer)\n"
 msgstr "檔案未預期的結束 (於結尾處)\n"
 
-#: g10/armor.c:847
+#: g10/armor.c:895
 msgid "error in trailer line\n"
 msgstr "結尾列有問題\n"
 
-#: g10/armor.c:1158
+#: g10/armor.c:1206
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 資料.\n"
 
-#: g10/armor.c:1163
+#: g10/armor.c:1211
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "無效的封裝: 列長超出 %d 字符\n"
 
-#: g10/armor.c:1167
+#: g10/armor.c:1215
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
@@ -843,8 +869,8 @@ msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
@@ -912,7 +938,7 @@ msgstr "取回公鑰的 URL: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -1017,7 +1043,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
 #: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
@@ -1037,7 +1063,7 @@ msgstr "私鑰部分無法取用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放於卡片上了\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
 msgid "quit this menu"
 msgstr "離開這個選單"
 
@@ -1045,7 +1071,7 @@ msgstr "離開這個選單"
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
@@ -1097,7 +1123,7 @@ msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
 msgid "Command> "
 msgstr "指令> "
 
@@ -1113,27 +1139,27 @@ msgstr "允許使用管理者指令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "讀取金鑰區塊時發生錯誤: %s\n"
@@ -1172,88 +1198,88 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
 
-#: g10/encode.c:230
+#: g10/encode.c:234
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "因為處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 
-#: g10/encode.c:244
+#: g10/encode.c:248
 #, c-format
 msgid "using cipher %s\n"
 msgstr "正在使用編密法 %s\n"
 
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是一個空檔案\n"
 
-#: g10/encode.c:469
+#: g10/encode.c:487
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "在 --pgp2 模式中, 妳祇能以 2048 位元以下的 RSA 金鑰加密\n"
 
-#: g10/encode.c:494
+#: g10/encode.c:512
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "正在從 `%s' 讀取中\n"
 
-#: g10/encode.c:522
+#: g10/encode.c:543
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "妳正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
 
-#: g10/encode.c:540
+#: g10/encode.c:561
 #, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告: 強迫使用壓縮演算法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:744
+#: g10/encode.c:767
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 
-#: g10/encode.c:841
+#: g10/encode.c:864
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已經加密給: \"%s\"\n"
 
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密過的資料\n"
 
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的演算法 %d 加密過\n"
 
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊息被以對稱式編密法的弱金鑰加密了.\n"
 
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
 msgid "problem handling encrypted packet\n"
 msgstr "處理加密的封包有問題\n"
 
@@ -1340,41 +1366,41 @@ msgstr ""
 msgid "export keys in an S-expression based format"
 msgstr ""
 
-#: g10/export.c:339
+#: g10/export.c:340
 msgid "exporting secret keys not allowed\n"
 msgstr "未被允許匯出私鑰\n"
 
-#: g10/export.c:368
+#: g10/export.c:369
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "金鑰 %s: 未被保護 - 已跳過\n"
 
-#: g10/export.c:376
+#: g10/export.c:377
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n"
 
-#: g10/export.c:387
+#: g10/export.c:388
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/export.c:538
+#: g10/export.c:539
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:561
+#: g10/export.c:562
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:582
+#: g10/export.c:583
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
 
-#: g10/export.c:631
+#: g10/export.c:632
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何東西\n"
 
@@ -1397,7 +1423,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
@@ -1412,7 +1438,7 @@ msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
 msgid ""
 "@Commands:\n"
 " "
@@ -1420,127 +1446,131 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: g10/gpg.c:367
+#: g10/gpg.c:369
 msgid "|[file]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: g10/gpg.c:368
+#: g10/gpg.c:370
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:382
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:383
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
 msgid "generate a new key pair"
 msgstr "產生一份新的金鑰對"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:387
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:389
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:390
 msgid "sign a key"
 msgstr "簽署某把金鑰"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:391
 msgid "sign a key locally"
 msgstr "僅在本地簽署某把金鑰"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:392
 msgid "sign or edit a key"
 msgstr "簽署或編輯某把金鑰"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:393
 msgid "generate a revocation certificate"
 msgstr "產生一份撤銷憑證"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:395
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:399
 msgid "search for keys on a key server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:401
 msgid "update all keys from a keyserver"
 msgstr "從某個金鑰伺服器上更新所有的金鑰"
 
-#: g10/gpg.c:403
+#: g10/gpg.c:405
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:408
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:409
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:410
 msgid "change a card's PIN"
 msgstr "變更某張卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:419
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:426
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
 #: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
 msgid ""
 "@\n"
@@ -1551,47 +1581,47 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:480
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:522
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:523
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1599,7 +1629,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1619,15 +1649,15 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: g10/gpg.c:760
+#: g10/gpg.c:764
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:767
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1637,7 +1667,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1645,542 +1675,542 @@ msgstr ""
 "\n"
 "已被支援的演算法:\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:781
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:791
+#: g10/gpg.c:795
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:882
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
 
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2894
+#: g10/gpg.c:2933
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2900
+#: g10/gpg.c:2939
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2952
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3057
 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:3020
+#: g10/gpg.c:3059
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3023
+#: g10/gpg.c:3062
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3073
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3175
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3141
+#: g10/gpg.c:3180
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3233
+#: g10/gpg.c:3272
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3255
+#: g10/gpg.c:3304
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3310
+#: g10/gpg.c:3359
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3412
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -2558,351 +2588,351 @@ msgstr "從金鑰中清除無法使用的部分"
 msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:268
+#: g10/import.c:271
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "正在跳過 %d 型態的區塊\n"
 
-#: g10/import.c:277
+#: g10/import.c:280
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "已有 %lu 把金鑰被處理了\n"
 
-#: g10/import.c:294
+#: g10/import.c:297
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "總共被處理的數量: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:299
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        已跳過的新金鑰: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:302
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       沒有使用者的 ID: %lu\n"
 
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
 #, c-format
 msgid "              imported: %lu"
 msgstr "                已匯入: %lu"
 
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              未改變的: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:312
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         新的使用者 ID: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:314
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              新的子鑰: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:316
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              新的簽章: %lu\n"
 
-#: g10/import.c:315
+#: g10/import.c:318
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          新的金鑰撤銷: %lu\n"
 
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "          被讀取的私鑰: %lu\n"
 
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "          已匯入的私鑰: %lu\n"
 
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "          未改變的私鑰: %lu\n"
 
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              未被匯入: %lu\n"
 
-#: g10/import.c:325
+#: g10/import.c:328
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "      已被清除掉的簽章: %lu\n"
 
-#: g10/import.c:327
+#: g10/import.c:330
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " 已被清除掉的使用者 ID: %lu\n"
 
-#: g10/import.c:568
+#: g10/import.c:571
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "警告: 金鑰 %s 含有不可用的偏好設定\n"
 
-#: g10/import.c:606
+#: g10/import.c:609
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
 
-#: g10/import.c:618
+#: g10/import.c:621
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
 
-#: g10/import.c:630
+#: g10/import.c:633
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 
-#: g10/import.c:643
+#: g10/import.c:646
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "我們強烈建議妳更新妳的偏好設定, 並\n"
 
-#: g10/import.c:645
+#: g10/import.c:648
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "重新散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 
-#: g10/import.c:669
+#: g10/import.c:672
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "妳可以像這樣更新妳的偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:748
+#: g10/import.c:751
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 
-#: g10/import.c:763
+#: g10/import.c:766
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "金鑰 %s: 非自我簽署的使用者 ID \"%s\" 已被接受\n"
 
-#: g10/import.c:769
+#: g10/import.c:772
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:771
+#: g10/import.c:774
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能是由於遺失自我簽章所導致的後果\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
 
-#: g10/import.c:787
+#: g10/import.c:790
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 
-#: g10/import.c:796
+#: g10/import.c:799
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/import.c:824
+#: g10/import.c:827
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已被匯入\n"
 
-#: g10/import.c:848
+#: g10/import.c:851
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定位原始的金鑰區塊: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:910
+#: g10/import.c:913
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:913
+#: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:916
+#: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的簽章\n"
 
-#: g10/import.c:919
+#: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
 
-#: g10/import.c:922
+#: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的子鑰\n"
 
-#: g10/import.c:925
+#: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的子鑰\n"
 
-#: g10/import.c:928
+#: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:931
+#: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:934
+#: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:937
+#: g10/import.c:940
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:960
+#: g10/import.c:963
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 沒有被改變\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1126
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
 
-#: g10/import.c:1134
+#: g10/import.c:1137
 msgid "importing secret keys not allowed\n"
 msgstr "未被允許匯入私鑰\n"
 
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1165
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: 私鑰被匯入了\n"
 
-#: g10/import.c:1192
+#: g10/import.c:1195
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "金鑰 %s: 已經在私鑰鑰匙圈中了\n"
 
-#: g10/import.c:1202
+#: g10/import.c:1205
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "金鑰 %s: 找不到私鑰: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1235
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:1275
+#: g10/import.c:1278
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1310
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已被匯入\n"
 
-#: g10/import.c:1373
+#: g10/import.c:1376
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:1388
+#: g10/import.c:1391
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 使用了未被支援的公鑰演算法\n"
 
-#: g10/import.c:1390
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 有無效的自我簽章\n"
 
-#: g10/import.c:1408
+#: g10/import.c:1411
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有子鑰可供附帶\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未被支援的公鑰演算法\n"
 
-#: g10/import.c:1421
+#: g10/import.c:1424
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:1436
+#: g10/import.c:1439
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多重附帶子鑰已被移除\n"
 
-#: g10/import.c:1458
+#: g10/import.c:1461
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:1471
+#: g10/import.c:1474
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:1486
+#: g10/import.c:1489
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:1528
+#: g10/import.c:1531
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:1549
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: 子鑰已跳過\n"
@@ -2911,65 +2941,65 @@ msgstr "金鑰 %s: 子鑰已跳過\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1576
+#: g10/import.c:1579
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
 
-#: g10/import.c:1586
+#: g10/import.c:1589
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1606
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:1617
+#: g10/import.c:1620
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1625
+#: g10/import.c:1628
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:1725
+#: g10/import.c:1728
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:1787
+#: g10/import.c:1790
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:1801
+#: g10/import.c:1804
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:1860
+#: g10/import.c:1863
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:1894
+#: g10/import.c:1897
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2286
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "請注意: 某份金鑰的序號 (S/N) 與卡片的序號並不吻合\n"
 
-#: g10/import.c:2291
+#: g10/import.c:2294
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2296
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "請注意: 次鑰在線上且已存放於卡片上了\n"
 
@@ -3077,12 +3107,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已經被撤銷了."
 
 #: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "妳仍然想要簽署它嗎? (y/N) "
 
 #: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
@@ -3264,8 +3294,8 @@ msgstr "我非常小心地檢查過這把金鑰了.\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
@@ -3274,19 +3304,19 @@ msgstr "簽署時失敗了: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上 (on-card) 金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
 msgid "This key is not protected.\n"
 msgstr "這把金鑰沒有被保護.\n"
 
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分沒辦法取用.\n"
 
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上 (on-card).\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
 msgid "Key is protected.\n"
 msgstr "金鑰被保護了.\n"
 
@@ -3303,11 +3333,11 @@ msgstr ""
 "輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
 msgid "passphrase not correctly repeated; try again"
 msgstr "密語再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3315,186 +3345,186 @@ msgstr ""
 "妳不想要用密語 - 這大概是個 *糟* 點子!\n"
 "\n"
 
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
 msgid "Do you really want to do this? (y/N) "
 msgstr "妳真的想要這麼做嗎? (y/N) "
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
 msgid "show key fingerprint"
 msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
 msgid "select user ID N"
 msgstr "使用者 ID 選了 N"
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
 msgid "select subkey N"
 msgstr "選擇次鑰 N"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
 msgid "check signatures"
 msgstr "檢查簽章"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "簽署所選的使用者 ID [* 請參見底下有關的註解]"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
 msgid "sign selected user IDs locally"
 msgstr "僅在本地簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
 msgid "sign selected user IDs with a trust signature"
 msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
 msgid "add a user ID"
 msgstr "增加一個使用者 ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
 msgid "add a photo ID"
 msgstr "增加一個照片 ID"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
 msgid "delete selected user IDs"
 msgstr "刪除所選的使用者 ID"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
 msgid "add a subkey"
 msgstr "增加一把次鑰"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
 msgid "add a key to a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
 msgid "move a key to a smartcard"
 msgstr "移動某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
 msgid "move a backup key to a smartcard"
 msgstr "移動某把備份金鑰至智慧卡"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
 msgid "delete selected subkeys"
 msgstr "刪除所選的次鑰"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
 msgid "add a revocation key"
 msgstr "增加一把撤銷金鑰"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
 msgid "delete signatures from the selected user IDs"
 msgstr "從所選的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "從金鑰或所選的次鑰中變更使用期限"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
 msgid "flag the selected user ID as primary"
 msgstr "把所選的使用者 ID 標為主要"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
 msgid "toggle between the secret and public key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
 msgid "list preferences (expert)"
 msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
 msgid "list preferences (verbose)"
 msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
 msgid "set preference list for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好金鑰伺服器 URL"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
 msgid "revoke signatures on the selected user IDs"
 msgstr "從所選的使用者 ID 上撤銷簽章"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
 msgid "revoke selected user IDs"
 msgstr "撤銷所選的使用者 ID"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
 msgid "revoke key or selected subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
 msgid "enable key"
 msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
 msgid "disable key"
 msgstr "禁用金鑰"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
 msgid "show selected photo IDs"
 msgstr "顯示所選的照片 ID"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "讀取私鑰區塊 \"%s\" 時出錯: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
 msgid "Secret key is available.\n"
 msgstr "私鑰可用.\n"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
 msgid "Need the secret key to do this.\n"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3505,154 +3535,154 @@ msgstr ""
 "  加上 `t' 的話就是信任簽章 (tsign), 加上 `nr' 的話就是不可撤銷簽章\n"
 "  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
 msgid "Key is revoked."
 msgstr "金鑰已經被撤銷了."
 
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的簽章種類 `%s'\n"
 
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
 msgid "You must select at least one user ID.\n"
 msgstr "妳至少得選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
 msgid "You can't delete the last user ID!\n"
 msgstr "妳不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移動主要金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
 msgid "You must select exactly one key.\n"
 msgstr "妳一定祇得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
 msgid "Command expects a filename argument\n"
 msgstr "這項指令應該要拿一個檔名當作參數\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "從 `%s' 讀取備份金鑰時發生錯誤: %s\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
 msgid "You must select at least one key.\n"
 msgstr "妳至少必須選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "妳真的想要刪除被選擇的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "妳真的要刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "妳真的想要撤銷這整把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "妳真的想要撤銷這些被選擇的次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "妳真的想要撤銷這把次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
 msgid "Set preference list to:\n"
 msgstr "設定偏好清單至:\n"
 
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3660,73 +3690,73 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好.\n"
 
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 給撤銷了\n"
 
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
 msgid "(sensitive)"
 msgstr "(機密的)"
 
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
 #: g10/keylist.c:194 g10/keyserver.c:516
 #, c-format
 msgid "created: %s"
 msgstr "建立於: %s"
 
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
 #, c-format
 msgid "revoked: %s"
 msgstr "已撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "已過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
 #, c-format
 msgid "expires: %s"
 msgstr "過期: %s"
 
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
 #, c-format
 msgid "usage: %s"
 msgstr "用法: %s"
 
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "This key has been disabled"
 msgstr "這把金鑰已經被禁用了"
 
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3734,17 +3764,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3752,7 +3782,7 @@ msgstr ""
 "警告: 沒有任何使用者 ID 已被標示為主要 ID. 這項指令可能\n"
 "      會導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3761,54 +3791,74 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這個完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這個無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這個未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這個自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
 msgid "Nothing deleted.\n"
 msgstr "沒有東西被刪除.\n"
 
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
 msgid "invalid"
 msgstr "無效"
 
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
+
 #: g10/keyedit.c:3252
 #, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
+
+#: g10/keyedit.c:3261
+#, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3817,192 +3867,192 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
 msgid "this key has already been designated as a revoker\n"
 msgstr "這把金鑰已被指定為撤銷者了\n"
 
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把次鑰.\n"
 
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更某把次鑰的使用期限.\n"
 
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
 
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
 msgid "Please select exactly one user ID.\n"
 msgstr "請精確地選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "簽章標記: "
 
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "是否覆寫? (y/N) "
 
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到次鑰\n"
 
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
 
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽署已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
 msgid "You are about to revoke these signatures:\n"
 msgstr "妳正在撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "次鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -4042,12 +4092,12 @@ msgid "writing key binding signature\n"
 msgstr "正在寫入附鑰簽章\n"
 
 #: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
@@ -4344,7 +4394,7 @@ msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)?
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4352,12 +4402,12 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4369,7 +4419,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4380,50 +4430,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
 msgid "Key generation canceled.\n"
 msgstr "已取消金鑰產生.\n"
 
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在將公鑰寫至 `%s'\n"
 
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已經被建立及簽署了.\n"
 
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4431,42 +4481,42 @@ msgstr ""
 "請注意這把金鑰不能用於加密之用.  也許妳會想藉由 \"--edit-key\" \n"
 "指令來產生加密用的次鑰.\n"
 
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -4611,7 +4661,7 @@ msgstr "已禁用"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)ext, 或 Q)uit > "
 
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d != 經手程式 %d)\n"
@@ -4645,306 +4695,306 @@ msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 msgid "searching for names from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "本版並不支援外部金鑰伺服器叫用\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n"
 
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
 
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 並不支援經手程式 (handler) 版本 %d\n"
 
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
 msgid "keyserver timed out\n"
 msgstr "金鑰伺服器逾時\n"
 
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
 msgid "keyserver internal error\n"
 msgstr "金鑰伺服器內部出錯\n"
 
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊出錯: %s\n"
 
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 正跳過\n"
 
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "正從 %s 更新 1 份金鑰\n"
 
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "正在更新 %d 份金鑰自 %s\n"
 
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密過的階段金鑰\n"
 
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的摘要演算法 %d 所產生\n"
 
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 加密了\n"
 
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 加密了\n"
 
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
 #, fuzzy
 msgid "no signature found\n"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已被抑制\n"
 
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處理這些多重簽章\n"
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署在 %s 過期\n"
 
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
@@ -4978,55 +5028,65 @@ msgstr "警告: 正在使用實驗性的摘要演算法 %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告: 摘要演算法 %s 已不建議使用\n"
 
-#: g10/misc.c:486
+#: g10/misc.c:490
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
-#: g10/misc.c:722
+#: g10/misc.c:726
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:726
+#: g10/misc.c:730
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:728
+#: g10/misc.c:732
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:735
+#: g10/misc.c:739
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個被反對使用的指令 - 別再用了\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "警告: \"%s\" 選項已不建議使用\n"
+
+#: g10/misc.c:813
 msgid "Uncompressed"
 msgstr "未被壓縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未被壓縮|無"
 
-#: g10/misc.c:931
+#: g10/misc.c:948
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1106
+#: g10/misc.c:1123
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的選項 `%s'\n"
 
-#: g10/misc.c:1131
+#: g10/misc.c:1148
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的選項 `%s'\n"
@@ -5082,7 +5142,7 @@ msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
@@ -5110,12 +5170,12 @@ msgstr "請輸入密語\n"
 msgid "cancelled by user\n"
 msgstr "由使用者取消了\n"
 
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5124,12 +5184,12 @@ msgstr ""
 "妳需要用密語來解開下列使用者的\n"
 "私鑰: \"%s\"\n"
 
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
 
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (在主鑰 ID %s 上的子鑰)"
@@ -5179,23 +5239,23 @@ msgstr "這張照片正確嗎? (y/N/q) "
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
 msgid "Key is superseded"
 msgstr "金鑰被代換了"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩漏了"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
 msgid "Key is no longer used"
 msgstr "金鑰不再被使用了"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
 msgid "User ID is no longer valid"
 msgstr "使用者 ID 不再有效了"
 
@@ -5262,7 +5322,7 @@ msgstr ""
 "這把金鑰的最小信任等級為: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
 msgid "Your decision? "
 msgstr "妳的決定是甚麼? "
 
@@ -5302,105 +5362,105 @@ msgstr ""
 "除非妳 **真的** 知道自己在做甚麼,\n"
 "否則妳最好在下一個問題回答 no\n"
 
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
 msgid "Use this key anyway? (y/N) "
 msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
 
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
 msgid "WARNING: Using untrusted key!\n"
 msgstr "警告: 正在使用不被信任的金鑰!\n"
 
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "警告: 這把金鑰可能已被撤銷了 (撤銷金鑰未出現)\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "警告: 這把金鑰已經被它的指定撤銷者給撤銷了!\n"
 
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "警告: 這把金鑰已經被它的持有人撤銷了!\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
 msgid "         This could mean that the signature is forged.\n"
 msgstr "         這很有可能表示這個簽章是被偽造的.\n"
 
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "警告: 這把子鑰已經被它的持有人撤銷了!\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
 msgid "Note: This key has been disabled.\n"
 msgstr "請注意: 這把金鑰已經被禁用了.\n"
 
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
 msgstr ""
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
 msgid "Note: This key has expired!\n"
 msgstr "請注意: 這把金鑰已經過期了!\n"
 
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
 
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告: 我們 *不* 信任這把金鑰!\n"
 
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         這個簽章很有可能是 *偽造的*.\n"
 
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         這份簽章並不屬於這個持有者\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳過: 公鑰已經存在了\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "妳沒有指定一個使用者 ID. (妳可能得用 \"-r\")\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
 msgid "Current recipients:\n"
 msgstr "目前的收件者:\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5408,42 +5468,42 @@ msgstr ""
 "\n"
 "輸入使用者 ID. 以空白列結束: "
 
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
 msgid "No such user ID.\n"
 msgstr "沒有這個使用者 ID.\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
 msgid "Public key is disabled.\n"
 msgstr "公鑰被禁用了.\n"
 
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
 msgid "skipped: public key already set\n"
 msgstr "已跳過: 公鑰已經被設過了\n"
 
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的預設收件者 \"%s\"\n"
 
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: 已跳過: 公鑰已經被禁用了\n"
 
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
 msgid "no valid addressees\n"
 msgstr "沒有有效的地址\n"
 
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "金鑰 %s 沒有使用者 ID\n"
 
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "金鑰 %s 沒有使用者 ID\n"
@@ -5452,27 +5512,32 @@ msgstr "金鑰 %s 沒有使用者 ID\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存它們\n"
 
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
 msgid "Detached signature.\n"
 msgstr "分離的簽章.\n"
 
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
 msgid "Please enter name of data file: "
 msgstr "請輸入資料檔的名稱: "
 
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
 msgid "reading stdin ...\n"
 msgstr "正在從標準輸入讀取 ...\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 msgid "no signed data\n"
 msgstr "沒有被簽署過的資料\n"
 
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "無法開啟被簽署過的資料 `%s'\n"
+
 #: g10/pubkey-enc.c:107
 #, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5506,7 +5571,7 @@ msgid "NOTE: key has been revoked"
 msgstr "請注意: 金鑰已經被撤銷了"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失敗: %s\n"
@@ -5528,11 +5593,11 @@ msgstr "(這是把機密的撤銷金鑰)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
 msgid "ASCII armored output forced.\n"
 msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失敗: %s\n"
@@ -5546,33 +5611,33 @@ msgstr "已建立撤銷憑證.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 
-#: g10/revoke.c:471
+#: g10/revoke.c:472
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私鑰 \"%s\": %s\n"
 
-#: g10/revoke.c:500
+#: g10/revoke.c:501
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "沒有相對應的公鑰: %s\n"
 
-#: g10/revoke.c:511
+#: g10/revoke.c:512
 msgid "public key does not match secret key!\n"
 msgstr "公鑰與私鑰並不吻合!\n"
 
-#: g10/revoke.c:518
+#: g10/revoke.c:519
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:535
+#: g10/revoke.c:536
 msgid "unknown protection algorithm\n"
 msgstr "未知的保護演算法\n"
 
-#: g10/revoke.c:543
+#: g10/revoke.c:544
 msgid "NOTE: This key is not protected!\n"
 msgstr "注意: 這把金鑰沒有被保護!\n"
 
-#: g10/revoke.c:594
+#: g10/revoke.c:595
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5591,33 +5656,33 @@ msgstr ""
 "但是千萬小心: 妳的機器上的列印系統可能會在列印過\n"
 "程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
 
-#: g10/revoke.c:635
+#: g10/revoke.c:637
 msgid "Please select the reason for the revocation:\n"
 msgstr "請選擇撤銷的原因:\n"
 
-#: g10/revoke.c:645
+#: g10/revoke.c:647
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:647
+#: g10/revoke.c:649
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也許妳會想要在這裡選擇 %d)\n"
 
-#: g10/revoke.c:688
+#: g10/revoke.c:690
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "請輸入選用的描述; 以空白列結束:\n"
 
-#: g10/revoke.c:716
+#: g10/revoke.c:718
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "撤銷原因: %s\n"
 
-#: g10/revoke.c:718
+#: g10/revoke.c:720
 msgid "(No description given)\n"
 msgstr "(沒有給定描述)\n"
 
-#: g10/revoke.c:723
+#: g10/revoke.c:725
 msgid "Is this okay? (y/N) "
 msgstr "這樣可以嗎? (y/N) "
 
@@ -5777,25 +5842,25 @@ msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:790
+#: g10/sign.c:792
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做分離簽署\n"
 
-#: g10/sign.c:866
+#: g10/sign.c:868
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:993
+#: g10/sign.c:995
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1105
+#: g10/sign.c:1110
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明文簽署\n"
 
-#: g10/sign.c:1285
+#: g10/sign.c:1294
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
@@ -6169,7 +6234,7 @@ msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
 
-#: g10/verify.c:118
+#: g10/verify.c:119
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6179,11 +6244,16 @@ msgstr ""
 "請記住簽章檔 (.sig 或 .asc)\n"
 "應該是第一個命令列給定的檔案.\n"
 
-#: g10/verify.c:195
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "輸入列 %u 太長或者列末的 LF 遺失了\n"
 
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "無法開啟 `%s': %s\n"
+
 #: jnlib/logging.c:626
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
@@ -6247,52 +6317,61 @@ msgstr "存放創生資料失敗: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
+
+#: scd/app-openpgp.c:1330
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "個人識別碼 (PIN) 收回時傳回錯誤: %s\n"
 
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV %d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 
-#: scd/app-openpgp.c:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV %d 失敗: %s\n"
 
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
 msgid "access to admin commands is not configured\n"
 msgstr "取用管理者指令尚未被組態過\n"
 
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
 msgid "card is permanently locked!\n"
 msgstr "卡片已被永久鎖住了!!\n"
 
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺留下來\n"
@@ -6300,108 +6379,107 @@ msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺�
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
 msgid "|A|Admin PIN"
 msgstr "|A|Admin PIN"
 
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
 msgid "creation timestamp missing\n"
 msgstr "建立的時間戳印缺漏\n"
 
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺漏或者尺寸並非 %d 位元\n"
 
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者尺寸並非 %d 位元\n"
 
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
 msgid "please wait while key is being generated ...\n"
 msgstr "公鑰正被產生中, 請稍候 ...\n"
 
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "金鑰產生已完工 (%d 秒)\n"
 
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP 卡片的格式無效 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止了\n"
 
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -6465,7 +6543,7 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/base64.c:318
+#: sm/base64.c:323
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "無效的 64 進位字符 %02x 被跳過了\n"
@@ -6489,139 +6567,139 @@ msgstr "gpg-agent 協定版本 %d 未被支援\n"
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
-#: sm/certchain.c:159
+#: sm/certchain.c:165
 #, fuzzy, c-format
 msgid "critical certificate extension %s is not supported"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
-#: sm/certchain.c:197
+#: sm/certchain.c:203
 msgid "issuer certificate is not marked as a CA"
 msgstr ""
 
-#: sm/certchain.c:236
+#: sm/certchain.c:242
 msgid "critical marked policy without configured policies"
 msgstr ""
 
-#: sm/certchain.c:246
+#: sm/certchain.c:252
 #, fuzzy, c-format
 msgid "failed to open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
 msgid "note: non-critical certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
 #, fuzzy
 msgid "certificate policy not allowed"
 msgstr "未被允許匯出私鑰\n"
 
-#: sm/certchain.c:397
+#: sm/certchain.c:403
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:417
+#: sm/certchain.c:423
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: sm/certchain.c:661
+#: sm/certchain.c:667
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "請注意: 金鑰已經被撤銷了"
 
-#: sm/certchain.c:670
+#: sm/certchain.c:676
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "損壞的憑證"
 
-#: sm/certchain.c:674
+#: sm/certchain.c:680
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "可用的金鑰於: "
 
-#: sm/certchain.c:676
+#: sm/certchain.c:682
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:681
+#: sm/certchain.c:687
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/certchain.c:759
+#: sm/certchain.c:765
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "產生一份撤銷憑證"
 
-#: sm/certchain.c:786
+#: sm/certchain.c:792
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:802
+#: sm/certchain.c:808
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:815
+#: sm/certchain.c:821
 #, fuzzy
 msgid "certificate has expired"
 msgstr "這把金鑰已經過期了!"
 
-#: sm/certchain.c:858
+#: sm/certchain.c:864
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:926
+#: sm/certchain.c:932
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:941
+#: sm/certchain.c:947
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "憑證中心 (CA) 指紋: "
 
-#: sm/certchain.c:949
+#: sm/certchain.c:955
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:964
+#: sm/certchain.c:970
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:970
+#: sm/certchain.c:976
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:980
+#: sm/certchain.c:986
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "驗證某份簽章"
 
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
@@ -6784,7 +6862,7 @@ msgstr "偏好設定 `%s' 重複了\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "刪除金鑰區塊時失敗了: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(沒有給定描述)\n"
@@ -6839,10 +6917,6 @@ msgstr "損壞的憑證"
 msgid "register a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
 #: sm/gpgsm.c:264
 msgid "pass a command to the dirmngr"
 msgstr ""
@@ -7007,29 +7081,39 @@ msgstr "用法: gpg [選項] "
 msgid "can't encrypt to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr ""
 
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法存取 `%s': %s\n"
 
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent 在此階段無法使用\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "請選擇妳要產生的金鑰種類:\n"
+
 #: sm/import.c:110
 #, fuzzy, c-format
 msgid "total number processed: %lu\n"
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 35fedfd55..bbb886239 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -2371,9 +2371,9 @@ ccid_transceive_secure (ccid_driver_t handle,
       /* The CHERRY XX44 does not yet work. I have not investigated it
          closer because there is another problem: It echos a "*" for
          each entered character and we somehow need to arrange that it
-         doesn't get to the tty at all.  Given thate are running
+         doesn't get to the tty at all.  Given that we are running
          without a control terminal there is not much we can do about.
-         A weird hack using pinentry comes in mind but I doubnt that
+         A weird hack using pinentry comes in mind but I doubt that
          this is a clean solution.  Need to contact Cherry.
        */
     default:
@@ -2417,8 +2417,11 @@ ccid_transceive_secure (ccid_driver_t handle,
       msg[14] = 0x00; /* bmPINLengthFormat:
                          Units are bytes, position is 0. */
     }
-  msg[15] = pinlen_max;   /* wPINMaxExtraDigit-Maximum.  */
+
+  /* The following is a little endian word. */
+  msg[15] = pinlen_max;   /* wPINMaxExtraDigit-Maximum. */
   msg[16] = pinlen_min;   /* wPINMaxExtraDigit-Minimum.  */
+
   msg[17] = 0x02; /* bEntryValidationCondition:
                      Validation key pressed */
   if (pinlen_min && pinlen_max && pinlen_min == pinlen_max)
diff --git a/sm/ChangeLog b/sm/ChangeLog
index a364e3b48..c4d1eec6d 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-31  Werner Koch  <[email protected]>
+
+	* gpgsm.c (main): Let --gen-key print a more informative error
+	message.
+
 2007-01-25  Werner Koch  <[email protected]>
 
 	* Makefile.am (gpgsm_LDADD): Add LIBICONV.  Noted by Billy Halsey.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 35dc921e7..9557ffbb9 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -253,7 +253,7 @@ static ARGPARSE_OPTS opts[] = {
     { aListSecretKeys, "list-secret-keys", 256, N_("list secret keys")},
     { aListChain,   "list-chain",  256, N_("list certificate chain")}, 
     { oFingerprint, "fingerprint", 256, N_("list keys and fingerprints")},
-    { aKeygen,	   "gen-key",  256, N_("generate a new key pair")},
+    { aKeygen,	   "gen-key",  256, "@" },
     { aDeleteKey, "delete-key",256, N_("remove key from the public keyring")},
     { aSendKeys, "send-keys"     , 256, N_("export keys to a key server") },
     { aRecvKeys, "recv-keys"     , 256, N_("import keys from a key server") },
@@ -1596,8 +1596,11 @@ main ( int argc, char **argv)
       break;
 
 
-    case aKeygen: /* generate a key */
-      log_error ("this function is not yet available from the commandline\n");
+    case aKeygen: /* Generate a key; well kind of. */
+      log_error 
+        (_("key generation is not available from the commandline\n"));
+      log_info (_("please use the script \"%s\" to generate a new key\n"),
+                "gpgsm-gencert.sh");
       break;
 
     case aImport:
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 47e0a589b..0cfadae02 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-31  Werner Koch  <[email protected]>
+
+	* Makefile.am (symcryptrun_LDADD): Add LIBICONV.
+	(gpgkey2ssh_LDADD): Ditto.
+
 2006-12-13  David Shaw  <[email protected]>
 
 	* Makefile.am (gpgsplit_LDADD): Link to LIBINTL if we're using the
diff --git a/tools/Makefile.am b/tools/Makefile.am
index fd7f8a431..11abca701 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -68,7 +68,7 @@ gpgparsemail_LDADD =
 
 symcryptrun_SOURCES = symcryptrun.c
 symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
-                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
+                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBINCONV)
 
 watchgnupg_SOURCES = watchgnupg.c 
 watchgnupg_LDADD = $(NETLIBS)
@@ -82,7 +82,7 @@ gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
 # common sucks in jnlib, via use of BUG() in an inline function, which
 # some compilers do not eliminate.
 gpgkey2ssh_LDADD = $(common_libs) \
-                   $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
+                   $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
 
 
 # Make sure that all libs are build before we use them.  This is