37 files changed, 28313 insertions, 22457 deletions

diff --git a/ChangeLog b/ChangeLog
index 9613806bb..ae82141f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-14  Werner Koch  <[email protected]>
+
+	Released 2.0.8rc1.
+
 2007-12-12  Werner Koch  <[email protected]>
 
 	* configure.ac (USE_CAMELLIA): Define by new option --enable-camellia.
diff --git a/configure.ac b/configure.ac
index 95905449b..b1e5ce69d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,8 @@ min_automake_version="1.10"
 # Remember to change the version number immediately *after* a release.
 # 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.8])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [2.0.8rc1])
+m4_define([my_issvn], [no])
 
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 99e677eaf..90cf9003b 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-14  Werner Koch  <[email protected]>
+
+	* gpg.c (main): Set opt.no_homedir_creation during the first option
+	parsing pass.
+
 2007-12-12  Werner Koch  <[email protected]>
 
 	* misc.c (print_pubkey_algo_note): Print a warning if a type 20
diff --git a/g10/gpg.c b/g10/gpg.c
index 75d44f6ca..db7b6e129 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1905,8 +1905,11 @@ main (int argc, char **argv )
 	    default_config = 0;
 	}
 	else if( pargs.r_opt == oNoOptions )
+          {
 	    default_config = 0; /* --no-options */
-	else if( pargs.r_opt == oHomedir )
+            opt.no_homedir_creation = 1;
+          }
+        else if( pargs.r_opt == oHomedir )
 	    set_homedir ( pargs.r.ret_str );
 	else if( pargs.r_opt == oNoPermissionWarn )
 	    opt.no_perm_warn=1;
diff --git a/po/ChangeLog b/po/ChangeLog
index e3f450244..a275d8e5c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-14  Werner Koch  <[email protected]>
+
+	* de.po: Update.
+
 2007-12-12  Werner Koch  <[email protected]>
 
 	* POTFILES.in: Add a couple of missing files.
diff --git a/po/be.po b/po/be.po
index 33313af69..adf435893 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -38,50 +38,50 @@ msgstr ""
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "дрэнны MPI"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "дрэнны пароль"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "дрэнны пароль"
@@ -91,21 +91,21 @@ msgstr "дрэнны пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -188,8 +188,8 @@ msgstr ""
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -267,7 +267,7 @@ msgid "Please enter the new passphrase"
 msgstr "Паўтарыце пароль\n"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -286,13 +286,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
@@ -371,8 +371,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
@@ -388,29 +388,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
@@ -520,12 +521,12 @@ msgstr ""
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -593,7 +594,7 @@ msgstr "скасавана карыстальнікам\n"
 msgid "error opening `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
@@ -618,7 +619,7 @@ msgstr "памылка чытаньня файла"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -843,6 +844,141 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "дрэнны сэртыфікат"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "дрэнны сэртыфікат"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "Даведка адсутнічае"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: створаны зьвязак ключоў\n"
+
+#: common/audit.c:728
+#, c-format
+msgid "algorithm: %s"
+msgstr ""
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Альгарытмы, якія падтрымліваюцца:\n"
+
+#: common/audit.c:734
+msgid "seems to be not encrypted"
+msgstr ""
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+msgid "Data verification succeeded"
+msgstr ""
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Гэты ключ згубіў састарэў!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "дрэнны сэртыфікат"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "дрэнны сэртыфікат"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "дрэнны сэртыфікат"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "невядомая вэрсыя"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Для \"%s\" даведка адсутнічае"
+
+#: common/helpfile.c:80
+msgid "ignoring garbage line"
+msgstr ""
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -958,13 +1094,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr ""
 
@@ -1137,7 +1273,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr ""
 
@@ -1252,18 +1388,18 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1304,7 +1440,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
@@ -1323,7 +1459,7 @@ msgstr "збой падпісаньня: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
@@ -1348,7 +1484,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1375,17 +1511,17 @@ msgstr ""
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
@@ -1528,7 +1664,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1543,7 +1679,7 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1559,27 +1695,27 @@ msgstr "|[файл]|зрабіць подпіс"
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
@@ -1592,11 +1728,11 @@ msgstr "паказаць сьпіс ключоў і подпісаў"
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
@@ -1632,11 +1768,11 @@ msgstr ""
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
@@ -1672,11 +1808,11 @@ msgstr ""
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1687,31 +1823,31 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 msgid "|FILE|write output to FILE"
 msgstr ""
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
@@ -1727,7 +1863,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1735,7 +1871,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1773,7 +1909,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1793,11 +1929,11 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1805,7 +1941,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
@@ -1876,456 +2012,456 @@ msgstr ""
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2970
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2976
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:2989
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3094
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3096
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3212
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3217
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -2338,7 +2474,7 @@ msgstr "выдаліць ключы са зьвязку грамадскіх к�
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr ""
 
@@ -2353,235 +2489,11 @@ msgid ""
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr ""
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr ""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr ""
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr ""
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr ""
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr ""
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr ""
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr ""
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr ""
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr ""
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Адкажыце \"так\", калі Вы згодны з перазапісам файла"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Даведка адсутнічае"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Для \"%s\" даведка адсутнічае"
@@ -2773,13 +2685,13 @@ msgstr ""
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
@@ -2869,7 +2781,7 @@ msgstr ""
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
@@ -3303,8 +3215,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -3313,20 +3225,20 @@ msgstr "збой падпісаньня: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
@@ -3343,7 +3255,7 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
@@ -3684,23 +3596,23 @@ msgstr ""
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3708,356 +3620,356 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2698
+#: g10/keyedit.c:2699
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2720
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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:3020
+#: g10/keyedit.c:3021
 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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 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:3366
+#: g10/keyedit.c:3367
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3426
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3448
+#: g10/keyedit.c:3449
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3474
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4100,12 +4012,12 @@ msgid "writing key binding signature\n"
 msgstr ""
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
@@ -4132,109 +4044,119 @@ msgstr "зашыфраваць даньні"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr ""
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr ""
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4244,7 +4166,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4254,48 +4176,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4305,44 +4227,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4350,7 +4272,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4365,34 +4287,34 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4400,7 +4322,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4408,91 +4330,91 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4793,193 +4715,193 @@ msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 msgid "public key is %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/mainproc.c:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1615
 #, fuzzy
 msgid "Key available at: "
 msgstr "Даведка адсутнічае"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4998,81 +4920,85 @@ msgstr ""
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr ""
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
@@ -5795,25 +5721,25 @@ msgstr ""
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/sign.c:758
+#: g10/sign.c:760
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -6132,7 +6058,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
@@ -6160,32 +6086,32 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6320,12 +6246,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6386,11 +6312,11 @@ msgstr "збой падпісаньня: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6501,12 +6427,12 @@ msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -6515,7 +6441,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 msgid "read options from file"
 msgstr ""
 
@@ -6576,21 +6502,21 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6599,11 +6525,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "даведка (help)"
@@ -6644,8 +6570,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
@@ -6776,61 +6702,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr ""
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "праверыць подпіс"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -6845,7 +6771,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6966,6 +6892,105 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "збой падпісаньня: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, c-format
+msgid "   (%d) RSA\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
+
+#: sm/certreqgen-ui.c:178
+#, c-format
+msgid "   (%d) sign\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:179
+#, c-format
+msgid "   (%d) encrypt\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+msgid "No subject name given\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+msgid "Enter email addresses"
+msgstr ""
+
+#: sm/certreqgen-ui.c:235
+msgid " (end with an empty line):\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Увядзіце новае ймя файла"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+msgid " (optional; end with an empty line):\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -6999,198 +7024,198 @@ msgstr ""
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 msgid "no valid recipients given\n"
 msgstr ""
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "дрэнны пароль"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 msgid "create base-64 encoded output"
 msgstr ""
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 msgid "|FILE|write an audit log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "праверыць подпісы ключа"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "заўсёдвы выкарыстоўваць MDC для шыфраваньня"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr ""
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ВУЗЕЛ|     выкарыстоўваць гэты паслужнік для пошуку ключоў"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|НАЗВА|     усталяваць мноства знакаў тэрмінала"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7201,36 +7226,36 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7336,7 +7361,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7355,30 +7380,30 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 msgid "                aka"
 msgstr ""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
@@ -7833,6 +7858,20 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "непадтрымліваецца"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Адкажыце \"так\", калі Вы згодны з перазапісам файла"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "даведка (help)"
@@ -7867,9 +7906,6 @@ msgstr "непадтрымліваецца"
 #~ msgid "general error"
 #~ msgstr "агульная памылка"
 
-#~ msgid "unknown version"
-#~ msgstr "невядомая вэрсыя"
-
 #~ msgid "bad public key"
 #~ msgstr "дрэнны грамадскі ключ"
 
diff --git a/po/ca.po b/po/ca.po
index c5ca06d72..e9fda16d1 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -59,51 +59,51 @@ msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "la contrasenya és errònia"
@@ -113,21 +113,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -212,8 +212,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
@@ -292,7 +292,7 @@ msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -312,13 +312,13 @@ msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detall"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
@@ -401,8 +401,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
@@ -418,29 +418,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
@@ -552,12 +553,12 @@ msgstr "\t%lu claus es descarta\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -628,7 +629,7 @@ msgstr "Cancel·la"
 msgid "error opening `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
@@ -654,7 +655,7 @@ msgstr "error de lectura: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -884,6 +885,158 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "Certificat de revocació vàlid"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr ""
+"No s'han trobat certificats amb confiança no definida.\n"
+"\n"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "La clau és disponible en: "
+
+# Fitxer indi fins final.  Hau!  ivb
+# Grrr. Com em tracten els esclaus ja... jm
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: s'ha creat l'anell\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "armadura: %s\n"
+
+# Suportats? ivb
+# A Softcatalà diuen molt «implementat». jm
+# 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
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Algoritmes suportats:\n"
+
+# Gènere?  Nombre?  ivb
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "no és xifrat"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "s'ha eliminat la verificació de signatura\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Aquesta signatura va caducar el %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Signatura correcta de \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "l'algoritme de dispersió és invàlid «%s»\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Aquesta signatura va caducar el %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Certificat de revocació vàlid"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr ""
+"No s'han trobat certificats amb confiança no definida.\n"
+"\n"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "Certificat correcte"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "Certificat invàlid"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "la versió és desconeguda"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "No hi ha ajuda disponible per a `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "error en l'última línia\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1011,14 +1164,14 @@ msgstr ""
 # Destès? ivb
 # Desatès, sí. jm
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
@@ -1196,7 +1349,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
@@ -1313,18 +1466,18 @@ msgstr "L'ordre no és vàlida (proveu «help»)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1369,7 +1522,7 @@ msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
@@ -1388,7 +1541,7 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
@@ -1417,7 +1570,7 @@ msgid ""
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1447,21 +1600,21 @@ msgstr "%s/%s xifrat per a: «%s»\n"
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, 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:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "problema en tractar amb un paquet xifrat\n"
 
@@ -1618,7 +1771,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1634,7 +1787,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1650,27 +1803,27 @@ msgstr "|[fitxer]|crea una signatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "llista claus"
 
@@ -1685,11 +1838,11 @@ msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
@@ -1725,11 +1878,11 @@ msgstr "genera un certificat de revocació"
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
@@ -1765,11 +1918,11 @@ msgstr "actualitza la base de dades de confiança"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1780,32 +1933,32 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
@@ -1821,7 +1974,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1832,7 +1985,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1875,7 +2028,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:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1895,11 +2048,11 @@ msgstr "Xifratge: "
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1907,7 +2060,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
@@ -1981,472 +2134,472 @@ msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\
 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:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, 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:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, 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:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, 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:2782
+#: g10/gpg.c:2821
 #, 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:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 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:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 #, 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:3048
+#: g10/gpg.c:3096
 #, 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:3051
+#: g10/gpg.c:3099
 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:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, 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:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 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:4162
+#: g10/gpg.c:4210
 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:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -2459,7 +2612,7 @@ msgstr "pren les claus d'aquest anell"
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps només un avís"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
@@ -2476,336 +2629,11 @@ msgstr ""
 "Sintaxi: gpg [opcions] [fitxers]\n"
 "Comprova signatures amb claus conegudes amb confiança\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"L'assignació d'un valor ací és cosa vostra; aquest valor mai s'exportarà\n"
-"a cap tercer. Ho necessitem per a implementar la xarxa de confiança; no té\n"
-"res a veure amb la xarxa de certificats (creada implícitament)."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Per a construir la xarxa de confiança, GnuPG necessita saber quines claus\n"
-"tenen confiança absoluta - aquestes són normalment les claus per a les que\n"
-"teniu accés a la clau secreta.  Contesteu «sí» per a donar a aquesta clau\n"
-"confiança absoluta\n"
-
-# "clau no confiable"? jm
-# No fiable, no de confiança, no de fiar...  ivb
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Si voleu utilitzar aquesta clau no de confiança de totes maneres, dieu «sí»."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Introduïu l'ID d'usuari de la persona a qui voleu enviar el missatge."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"En general no és bona idea utilitzar la mateixa clau per a signar i\n"
-"xifrar. Aquest algoritme només s'hauria d'usar en tasques concretes.\n"
-"Si us plau, consulteu al vostre expert en seguretat primer."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Introduïu la grandària de la clau"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Contesteu «sí» o «no»"
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Introduïu el valor requerit tal i com es mostra en l'indicatiu.\n"
-"És possible introduir una data ISO (AAAA-MM-DD) però no rebreu\n"
-"una bona resposta d'error - en canvi, el sistema tractarà d'interpretar\n"
-"el valor donat com un interval."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Introduïu el nom del propietari de la clau"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "introduïu una adreça de correu (opcional però molt recomanable)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Introduïu un comentari opcional"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  canvia el nom.\n"
-"C  canvia el comentari.\n"
-"E  canvia l'adreça de correu electrònic.\n"
-"O  continua la generació de les claus.\n"
-"Q  ix."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Contesteu «sí» (o només «s») si és correcte generar la subclau."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Quan signeu un ID d'usuari d'una clau, primer hauríeu de verificar que la "
-"clau\n"
-"pertany a la persona esmentada en l'ID d'usuari.  És útil per a altres "
-"saber\n"
-"amb quanta cura heu verificat açò.\n"
-"\n"
-"«0» significa que no feu cap declaració de amb quanta cura heu verificat\n"
-"    la clau.\n"
-"\n"
-"«1» significa que creieu que la clau és de la persona que diu que és la\n"
-"    propietària, però no heu pogut, o no heu verificat la clau de cap "
-"manera.\n"
-"    Açò és útil per a la verificació d'un «rol», quan signeu la clau d'un\n"
-"    usuari amb pseudònim.\n"
-"\n"
-"«2» significa que heu fet algunes comprovacions de la clau. Per exemple, "
-"açò\n"
-"    pot significar que heu verificat la emprenta digital de la clau i "
-"verificat\n"
-"    l'ID d'usuari en la clau amb el photo ID.\n"
-"\n"
-"«3» significa que heu fet una verificació exhaustiva de la clau. Per "
-"exemple,\n"
-"    açò pot significar que heu verificat la emprenta digital amb el "
-"propietari\n"
-"    de la clau en persona, i que heu comprovat, mitjançant un document "
-"difícil\n"
-"    de falsificar amb photo ID (com un passaport) que el nom del propietari\n"
-"    coincideix amb el nom de l'ID d'usuari en la clau, i finalment que heu\n"
-"    verificat (per intercanvi de correu) que l'adreça de correu en la clau\n"
-"    pertany al propietari de la clau.\n"
-"\n"
-"Teniu en compte que els exemples donats anteriorment per als nivels 2 i 3 "
-"són\n"
-"*només* exemples. Al final, és cosa vostra decidir què significa «alguna» i\n"
-"«exhaustiva» per a vosaltres quan voleu signar altres claus.\n"
-"\n"
-"Si no sabeu quina és la resposta correcta, contesteu «0»."
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Contesteu «sí» si voleu signar TOTS els ID d'usuari"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Contesteu «sí» si realment voleu eliminar aquest ID d'usuari.\n"
-"Tots els certificats també es perdran!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Contesteu «sí» si és correcte eliminar la subclau"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Aquesta és una signatura vàlida en la clau; normalment no voldreu\n"
-"eliminar aquesta signatura perquè pot ser important per a establir\n"
-"una connexió de confiança a la clau o a un altra clau certificada\n"
-"per aquesta clau."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Aquesta signatura no es pot comprovar perquè no teniu la clau\n"
-"corresponent. Hauríeu de posposar la seua eliminació fins que\n"
-"sapieu quina clau es va utilitzar ja que aquesta clau de signatura\n"
-"podria establir una connexió de confiança a través d'una altra clau ja\n"
-"certificada."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-"La signatura no és vàlida. Té sentit que l'elimineu de l'anell\n"
-"de claus."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Aquesta és una signatura que enllaça l'ID de l'usuari amb la clau.\n"
-"Normalment no és una bona idea eliminar una signatura com aquesta.\n"
-"Actualment, GnuPG podria no poder utilitzar aquesta clau de nou, així\n"
-"que feu açò només si l'autosignatura no és vàlida per alguna raó i\n"
-"hi ha una segona disponible."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Canvia les preferències de tots els ID d'usuari (o només els dels "
-"seleccionats)\n"
-"a la llista actual de preferències. Les marques de temps de totes les\n"
-"autosignatures afectades s'avançaran un segon.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Per favor, repetiu l'última contrasenya per confirmar-la."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Doneu el nom del fitxer al qual s'aplica la signatura"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Contesteu «sí» si és correcte sobreescriure el fitxer"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Introduïu un nom de fitxer. Si premeu RETORN s'hi usarà el fitxer\n"
-"predeterminat (apareix entre claudàtors)."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Hauríeu d'especificar una raó per a la certificació. Depenent del\n"
-"context teniu l'habilitat de triar d'aquesta llista:\n"
-"  «La clau ha estat compromesa»\n"
-"      Utilitzeu açò si teniu alguna raó per creure que persones no\n"
-"      autoritzades han tingut accés a la vostra clau secreta.\n"
-"  «La clau ha estat reemplaçada»\n"
-"      Utilitzeu açò si heu reemplaçat aquesta clau amb una més nova.\n"
-"  «La clau ja no està en ús»\n"
-"      Utilitzeu açò si heu retirat aquesta clau.\n"
-"  «L'ID de l'usuari ja no és vàlid»\n"
-"      Utilitzeu açò per a constatar que l'ID de l'usuari no s'hauria\n"
-"      d'utilitzar més; açò s'utilitza normalment per a marcar una adreça\n"
-"      de correu com a invàlida.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Si voleu podeu introduir un text que descriga per què expediu aquest\n"
-"certificat de revocació. Per favor, sigueu concisos.\n"
-"Una línia buida indica el final del text.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "No hi ha ajuda disponible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
@@ -3000,13 +2828,13 @@ msgstr "clau %08lX: clau nova - es descarta \n"
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
@@ -3096,7 +2924,7 @@ msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
@@ -3594,8 +3422,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -3604,20 +3432,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 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:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
@@ -3634,7 +3462,7 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
@@ -4015,97 +3843,97 @@ msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4113,19 +3941,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:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4135,7 +3963,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4144,78 +3972,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 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:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4224,205 +4052,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:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 #, 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:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, 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:3547
+#: g10/keyedit.c:3548
 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:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, 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:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, 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:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 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:4659
+#: g10/keyedit.c:4660
 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:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4466,12 +4294,12 @@ msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, 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:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
@@ -4499,109 +4327,119 @@ msgstr "xifra dades"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (només xifrar)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4617,7 +4455,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4633,42 +4471,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
 # Amb «it» es refereix a les dates?  ivb
 # Això vaig entendre jo. jm
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4676,12 +4514,12 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les tractarà bé fins l'any 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4698,44 +4536,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4746,7 +4584,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 
@@ -4763,23 +4601,23 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4787,12 +4625,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4804,7 +4642,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4816,53 +4654,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, 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:3342
+#: g10/keygen.c:3356
 #, 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:3349
+#: g10/keygen.c:3363
 #, 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:3369
+#: g10/keygen.c:3383
 #, 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:3377
+#: g10/keygen.c:3391
 #, 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:3404
+#: g10/keygen.c:3418
 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:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4871,13 +4709,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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, 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:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4886,7 +4724,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4894,26 +4732,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:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, 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:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -5222,199 +5060,199 @@ msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 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:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, 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:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
@@ -5433,56 +5271,61 @@ msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "AVÍS: %s és una opció desaconsellada.\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "l'algoritme de xifratge no és implementat"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el mòdul de xifratge IDEA no està present\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostra més informació\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
@@ -5490,7 +5333,7 @@ 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "No comprimit"
 
@@ -5498,22 +5341,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:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
@@ -6319,29 +6162,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, 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:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
@@ -6678,7 +6521,7 @@ msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
@@ -6710,33 +6553,33 @@ msgstr "si us plau, feu un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 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"
@@ -6875,12 +6718,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6941,11 +6784,11 @@ msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -7057,12 +6900,12 @@ msgstr "signatura %s, algorisme de resum %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -7071,7 +6914,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "s'estan llegint opcions de «%s»\n"
@@ -7134,22 +6977,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7158,11 +7001,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "ajuda"
@@ -7203,8 +7046,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
@@ -7342,68 +7185,68 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, 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:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una signatura"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "certificat duplicat: esborrat"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7418,7 +7261,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7550,6 +7393,113 @@ msgstr "error en crear l'anell «%s»: %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (només signar)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) RSA (només xifrar)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (signar i xifrar)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (només signar)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (només xifrar)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(No es va donar una descripció)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "l'algoritme de dispersió és invàlid «%s»\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Adreça electrònica: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Introduïu el nou nom del fitxer"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr ""
+"Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "Introduïu el nom d'usuari: "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7583,196 +7533,196 @@ 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:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "llista claus secretes"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea eixida amb armadura ascii"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "usa la clau predeterminada com a destinatari predeterminat"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "no usa el terminal en absolut"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "força signatures v3"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "sempre utilitza un MDC per a xifrar"
 
 # Mode desatès (SC)  ivb
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "mode desatès: no pregunta mai"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "suposa «sí» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "suposa «no» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "afegeix aquest anell secret a la llista"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a cercar claus"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|el joc de caràcters serà NOM"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritme de compressió N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7783,37 +7733,37 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7920,7 +7870,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7939,31 +7889,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Signatura correcta de \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -8423,6 +8373,316 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "L'assignació d'un valor ací és cosa vostra; aquest valor mai s'exportarà\n"
+#~ "a cap tercer. Ho necessitem per a implementar la xarxa de confiança; no "
+#~ "té\n"
+#~ "res a veure amb la xarxa de certificats (creada implícitament)."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Per a construir la xarxa de confiança, GnuPG necessita saber quines "
+#~ "claus\n"
+#~ "tenen confiança absoluta - aquestes són normalment les claus per a les "
+#~ "que\n"
+#~ "teniu accés a la clau secreta.  Contesteu «sí» per a donar a aquesta "
+#~ "clau\n"
+#~ "confiança absoluta\n"
+
+# "clau no confiable"? jm
+# No fiable, no de confiança, no de fiar...  ivb
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Si voleu utilitzar aquesta clau no de confiança de totes maneres, dieu "
+#~ "«sí»."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr ""
+#~ "Introduïu l'ID d'usuari de la persona a qui voleu enviar el missatge."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "En general no és bona idea utilitzar la mateixa clau per a signar i\n"
+#~ "xifrar. Aquest algoritme només s'hauria d'usar en tasques concretes.\n"
+#~ "Si us plau, consulteu al vostre expert en seguretat primer."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Introduïu la grandària de la clau"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Contesteu «sí» o «no»"
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Introduïu el valor requerit tal i com es mostra en l'indicatiu.\n"
+#~ "És possible introduir una data ISO (AAAA-MM-DD) però no rebreu\n"
+#~ "una bona resposta d'error - en canvi, el sistema tractarà d'interpretar\n"
+#~ "el valor donat com un interval."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Introduïu el nom del propietari de la clau"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "introduïu una adreça de correu (opcional però molt recomanable)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Introduïu un comentari opcional"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  canvia el nom.\n"
+#~ "C  canvia el comentari.\n"
+#~ "E  canvia l'adreça de correu electrònic.\n"
+#~ "O  continua la generació de les claus.\n"
+#~ "Q  ix."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Contesteu «sí» (o només «s») si és correcte generar la subclau."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Quan signeu un ID d'usuari d'una clau, primer hauríeu de verificar que la "
+#~ "clau\n"
+#~ "pertany a la persona esmentada en l'ID d'usuari.  És útil per a altres "
+#~ "saber\n"
+#~ "amb quanta cura heu verificat açò.\n"
+#~ "\n"
+#~ "«0» significa que no feu cap declaració de amb quanta cura heu verificat\n"
+#~ "    la clau.\n"
+#~ "\n"
+#~ "«1» significa que creieu que la clau és de la persona que diu que és la\n"
+#~ "    propietària, però no heu pogut, o no heu verificat la clau de cap "
+#~ "manera.\n"
+#~ "    Açò és útil per a la verificació d'un «rol», quan signeu la clau "
+#~ "d'un\n"
+#~ "    usuari amb pseudònim.\n"
+#~ "\n"
+#~ "«2» significa que heu fet algunes comprovacions de la clau. Per exemple, "
+#~ "açò\n"
+#~ "    pot significar que heu verificat la emprenta digital de la clau i "
+#~ "verificat\n"
+#~ "    l'ID d'usuari en la clau amb el photo ID.\n"
+#~ "\n"
+#~ "«3» significa que heu fet una verificació exhaustiva de la clau. Per "
+#~ "exemple,\n"
+#~ "    açò pot significar que heu verificat la emprenta digital amb el "
+#~ "propietari\n"
+#~ "    de la clau en persona, i que heu comprovat, mitjançant un document "
+#~ "difícil\n"
+#~ "    de falsificar amb photo ID (com un passaport) que el nom del "
+#~ "propietari\n"
+#~ "    coincideix amb el nom de l'ID d'usuari en la clau, i finalment que "
+#~ "heu\n"
+#~ "    verificat (per intercanvi de correu) que l'adreça de correu en la "
+#~ "clau\n"
+#~ "    pertany al propietari de la clau.\n"
+#~ "\n"
+#~ "Teniu en compte que els exemples donats anteriorment per als nivels 2 i 3 "
+#~ "són\n"
+#~ "*només* exemples. Al final, és cosa vostra decidir què significa «alguna» "
+#~ "i\n"
+#~ "«exhaustiva» per a vosaltres quan voleu signar altres claus.\n"
+#~ "\n"
+#~ "Si no sabeu quina és la resposta correcta, contesteu «0»."
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Contesteu «sí» si voleu signar TOTS els ID d'usuari"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Contesteu «sí» si realment voleu eliminar aquest ID d'usuari.\n"
+#~ "Tots els certificats també es perdran!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Contesteu «sí» si és correcte eliminar la subclau"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Aquesta és una signatura vàlida en la clau; normalment no voldreu\n"
+#~ "eliminar aquesta signatura perquè pot ser important per a establir\n"
+#~ "una connexió de confiança a la clau o a un altra clau certificada\n"
+#~ "per aquesta clau."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Aquesta signatura no es pot comprovar perquè no teniu la clau\n"
+#~ "corresponent. Hauríeu de posposar la seua eliminació fins que\n"
+#~ "sapieu quina clau es va utilitzar ja que aquesta clau de signatura\n"
+#~ "podria establir una connexió de confiança a través d'una altra clau ja\n"
+#~ "certificada."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "La signatura no és vàlida. Té sentit que l'elimineu de l'anell\n"
+#~ "de claus."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Aquesta és una signatura que enllaça l'ID de l'usuari amb la clau.\n"
+#~ "Normalment no és una bona idea eliminar una signatura com aquesta.\n"
+#~ "Actualment, GnuPG podria no poder utilitzar aquesta clau de nou, així\n"
+#~ "que feu açò només si l'autosignatura no és vàlida per alguna raó i\n"
+#~ "hi ha una segona disponible."
+
+#~ 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 ""
+#~ "Canvia les preferències de tots els ID d'usuari (o només els dels "
+#~ "seleccionats)\n"
+#~ "a la llista actual de preferències. Les marques de temps de totes les\n"
+#~ "autosignatures afectades s'avançaran un segon.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "Per favor, repetiu l'última contrasenya per confirmar-la."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Doneu el nom del fitxer al qual s'aplica la signatura"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Contesteu «sí» si és correcte sobreescriure el fitxer"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Introduïu un nom de fitxer. Si premeu RETORN s'hi usarà el fitxer\n"
+#~ "predeterminat (apareix entre claudàtors)."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Hauríeu d'especificar una raó per a la certificació. Depenent del\n"
+#~ "context teniu l'habilitat de triar d'aquesta llista:\n"
+#~ "  «La clau ha estat compromesa»\n"
+#~ "      Utilitzeu açò si teniu alguna raó per creure que persones no\n"
+#~ "      autoritzades han tingut accés a la vostra clau secreta.\n"
+#~ "  «La clau ha estat reemplaçada»\n"
+#~ "      Utilitzeu açò si heu reemplaçat aquesta clau amb una més nova.\n"
+#~ "  «La clau ja no està en ús»\n"
+#~ "      Utilitzeu açò si heu retirat aquesta clau.\n"
+#~ "  «L'ID de l'usuari ja no és vàlid»\n"
+#~ "      Utilitzeu açò per a constatar que l'ID de l'usuari no s'hauria\n"
+#~ "      d'utilitzar més; açò s'utilitza normalment per a marcar una adreça\n"
+#~ "      de correu com a invàlida.\n"
+
+#~ 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 ""
+#~ "Si voleu podeu introduir un text que descriga per què expediu aquest\n"
+#~ "certificat de revocació. Per favor, sigueu concisos.\n"
+#~ "Una línia buida indica el final del text.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "no es poden ficar dades de notació dins de signatures v3 (estil PGP 2.x)\n"
@@ -8575,10 +8835,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 #~ msgstr "Introduïu el nom d'usuari: "
 
 #, fuzzy
-#~ msgid "Enter PIN: "
-#~ msgstr "Introduïu el nom d'usuari: "
-
-#, fuzzy
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
@@ -8592,9 +8848,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 #~ msgid "unknown packet type"
 #~ msgstr "el tipus de paquet és desconegut"
 
-#~ msgid "unknown version"
-#~ msgstr "la versió és desconeguda"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "l'algoritme de clau pública és desconegut"
 
@@ -8719,12 +8972,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 #~ msgid "network error"
 #~ msgstr "error de la xarxa"
 
-# Gènere?  Nombre?  ivb
-# Werner FIXME: please add translator comment saying *what* is
-# uncompressed so we know the gender. jm
-#~ msgid "not encrypted"
-#~ msgstr "no és xifrat"
-
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
@@ -8972,9 +9219,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 #~ msgid "preference %c%lu is not valid\n"
 #~ msgstr "la preferència %c%lu no és vàlida\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (signar i xifrar)\n"
-
 #~ msgid ""
 #~ "About to generate a new %s keypair.\n"
 #~ "              minimum keysize is  768 bits\n"
@@ -9506,9 +9750,6 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 #~ msgid "Invalid certificate revocation"
 #~ msgstr "Certificat de revocació invàlid"
 
-#~ msgid "Invalid certificate"
-#~ msgstr "Certificat invàlid"
-
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "el registre de signatura %lu[%d] apunta a un registre incorrecte.\n"
 
diff --git a/po/cs.po b/po/cs.po
index 09f59d77c..c4a52003b 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -40,51 +40,51 @@ msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 msgid "Quality:"
 msgstr "platnost: %s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "�patn� MPI"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�patn� heslo"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "�patn� heslo"
@@ -94,21 +94,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -190,8 +190,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -270,7 +270,7 @@ msgid "Please enter the new passphrase"
 msgstr "zm�nit heslo"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -289,13 +289,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
@@ -377,8 +377,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -396,29 +396,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
@@ -530,12 +531,12 @@ msgstr "%s: p�esko�eno: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -606,7 +607,7 @@ msgstr "zru�eno"
 msgid "error opening `%s': %s\n"
 msgstr "chyba v `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
@@ -631,7 +632,7 @@ msgstr "chyba p�i �ten� v `%s': %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -857,6 +858,145 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "�patn� certifik�t"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "�patn� certifik�t"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "vypi� v�echna dostupn� data"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "platnost: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Podporovan� algoritmy:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "neza�ifrov�no"
+
+#: common/audit.c:740
+#, fuzzy
+msgid "Number of recipients"
+msgstr "Aktu�ln� p��jemci:\n"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "verifikace podpisu potla�ena\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Podpis vytvo�en %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Dobr� podpis od \"%s\""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "neplatn� hashovac� algoritmus `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Podpis vytvo�en %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Platnost kl��e vypr�ela!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "�patn� certifik�t"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "�patn� certifik�t"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "�patn� certifik�t"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "nezn�m� verze"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Pomoc nen� dostupn� pro '%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "chyba v pati�ce\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -976,13 +1116,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
@@ -1149,7 +1289,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
@@ -1253,18 +1393,18 @@ msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1305,7 +1445,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -1324,7 +1464,7 @@ msgstr "pou�it� �ifry: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
@@ -1351,7 +1491,7 @@ msgid ""
 msgstr ""
 "VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1380,17 +1520,17 @@ msgstr "%s/%s za�ifrovan� pro: %s\n"
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� data\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m se za�ifrovan�m paketem\n"
 
@@ -1538,7 +1678,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
@@ -1553,7 +1693,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1569,27 +1709,27 @@ msgstr "|[soubor]|vytvo�it podpis"
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
@@ -1601,11 +1741,11 @@ msgstr "vypsat seznam kl��� a podpis�"
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
@@ -1641,11 +1781,11 @@ msgstr "vytvo�it revoka�n� certifik�t"
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
@@ -1681,11 +1821,11 @@ msgstr "aktualizovat datab�zi d�v�ry"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1696,36 +1836,36 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 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:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
@@ -1741,7 +1881,7 @@ msgstr "pou��t chov�n� striktn� podle OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1749,7 +1889,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1787,7 +1927,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1807,11 +1947,11 @@ msgstr "�ifra: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1819,7 +1959,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
@@ -1909,463 +2049,463 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, 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:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, 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:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 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:3042
+#: g10/gpg.c:3090
 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:3044
+#: g10/gpg.c:3092
 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 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:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 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:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 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:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -2377,7 +2517,7 @@ msgstr "ber kl��e z t�to kl��enky (keyringu)"
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
@@ -2393,335 +2533,11 @@ msgstr ""
 "Syntaxe: gpg [volby] [souboru]\n"
 "Ov��� podpisy proti zn�m�m, d�v�ryhodn�m kl���m\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Je na V�s, abyste zde p�i�adil(a) hodnotu; tato hodnota nebude nikdy\n"
-"exportov�na t�et� stran�. Pot�ebujeme ji k implementaci \"pavu�iny\n"
-"d�v�ry\"; nem� to nic spole�n�ho s (implicitn� vytvo�enou) \"pavu�inou\n"
-"certifik�t�\"."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Aby bylo mo�n� vybudovat pavu�inu d�v�ry, mus� GnuPG v�d�t, kter�m kl���m\n"
-"d�v��ujete absolutn� - obvykle to jsou ty kl��e, pro n� m�te p��stup\n"
-"k tajn�m kl���m. Odpov�zte \"ano\", abyste nastavili tyto kl��e\n"
-"jako absolutn� d�v�ryhodn�\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Pokud p�esto chcete pou��t tento ned�v�ryhodn� kl��, odpov�zte \"ano\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Vlo�te identifik�tor adres�ta, kter�mu chcete poslat zpr�vu."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"Vyberte algoritmus, kter� chcete pou��t.\n"
-"\n"
-"DSA (alias DSS) je Digital Signature Algorithm a m��e b�t pou�it pouze pro\n"
-"podepisov�n�.\n"
-"\n"
-"Elgamal je pouze �ifrovac� algoritmus.\n"
-"\n"
-"RSA m��e b�t pou�it pro �ifrov�n� anebo podepisov�n�.\n"
-"\n"
-"Prvn� (prim�rn�) kl�� mus� b�t v�dy kl��, pomoc� kter�ho lze podepisovat."
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"Obecn� nelze doporu�it pou��vat stejn� kl�� pro �ifrov�n� a podepisov�n�\n"
-"Tento algoritmus je vhodn� pou��t jen za jist�ch podm�nek.\n"
-"Kontaktujte pros�m nejprve bezpe�nostn�ho specialistu."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Vlo�te d�lku kl��e"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Odpov�zte \"ano\" nebo \"ne\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Vlo�te po�adovanou hodnotu tak, jak je uvedeno v p��kazov�m ��dku.\n"
-"Je mo�n� vlo�it datum ve form�tu ISO (RRRR-MM-DD), ale nedostanete\n"
-"spr�vnou chybovou hl�ku - m�sto toho syst�m zkus� interpretovat\n"
-"zadanou hodnotu jako interval."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Vlo�te jm�no dr�itele kl��e"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "pros�m, vlo�te e-mailovou adresu (nepovinn�, ale velmi doporu�ovan�)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Pros�m, vlo�te nepovinn� koment��"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  pro zm�nu n�zvu.\n"
-"C  pro zm�nu koment��e.\n"
-"E  pro zm�nu e-mailov� adresy.\n"
-"O  pro pokra�ov�n� generov�n� kl��e.\n"
-"Q  pro ukon�en� generov�n� kl��e."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Jestli�e chcete generovat podkl��, odpov�zte \"ano\" (nebo jen \"a\")."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Ne� podep��ete id u�ivatele, m�li byste nejprve ov��it, zda kl��\n"
-"pat�� osob�, jej�� jm�no je uvedeno v identifik�toru u�ivatele.\n"
-"Je velmi u�ite�n�, kdy� ostatn� v�d�, jak d�sledn� jste provedl(a)\n"
-"takov� ov��en�.\n"
-"\n"
-"\"0\" znamen�, �e neuv�d�te, jak d�sledn� jste pravost kl��e ov��il(a) \n"
-"\n"
-"\"1\" znamen�, �e v���te tomu, �e kl�� pat�� osob�, kter� je uvedena,\n"
-"    v u�ivatelsk�m ID, ale nemohl jste nebo jste neprov��il tuto "
-"skute�nost.\n"
-"    To je u�ite�n� pro \"osobn�\" verifikaci, kdy� podepisujete kl��e, "
-"kter�\n"
-"    pou��vaj� pseudonym u�ivatele.\n"
-"\n"
-"\"2\" znamen�, �e jste ��ste�n� ov��il pravost kl��e. Nap�. jste ov��il\n"
-"    fingerprint kl��e a zkontroloval identifik�tor u�ivatele\n"
-"    uveden� na kl��i s fotografick�m id.\n"
-"\n"
-"\"3\" Znamen�, �e jste provedl velmi pe�liv� ov��en� pravosti kl��e.\n"
-"    To m��e nap��klad znamenat, �e jste ov��il fingerprint kl��e \n"
-"    jeho vlastn�ka osobn� a d�le jste pomoc� obt��n� pad�lateln�ho \n"
-"    dokumentu s fotografi� (nap��klad pasu) ov��il, �e jm�no majitele\n"
-"    kl��e se shoduje se jm�nem uveden�m v u�ivatelsk�m ID a d�le jste \n"
-"    ov��il (v�m�nou elektronick�ch dopis�), �e elektronick� adresa uveden� \n"
-"    v ID u�ivatele pat�� majiteli kl��e.\n"
-"\n"
-"Pros�m nezapome�te, �e p��klady uveden� pro �rove� 2 a 3 jsou *pouze*\n"
-"p��klady.\n"
-"Je jen na Va�em rozhodnut� co \"��ste�n�\" a \"pe�liv�\" ov��en� znamen�\n"
-"kdy� budete podepisovat kl��e jin�m u�ivatel�m.\n"
-"\n"
-"Pokud nev�te, jak� je spr�vn� odpov��, odpov�zte \"0\"."
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr ""
-"Pokud chcete podepsat V�ECHNY identifik�tory u�ivatel�, odpov�zte \"ano\""
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Pokud opravdu chcete smazat tento identifik�tor u�ivatele, odpov�zte \"ano"
-"\".\n"
-"V�echny certifik�ty budou tak� ztraceny!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Odpov�zte \"ano\", pokud chcete smazat podkl��"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Toto je platn� podpis kl��e; norm�ln� nechcete tento podpis smazat,\n"
-"proto�e m��e b�t d�le�it� p�i vytv��en� d�v�ry kl��e nebo jin�ho kl��e\n"
-"ceritifikovan�ho t�mto kl��em."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Tento podpis nem��e b�t ov��en, proto�e nem�te odpov�daj�c� ve�ejn� kl��.\n"
-"Jeho smaz�n� byste m�l(a) odlo�it do doby, ne� budete zn�t, kter� kl��\n"
-"byl pou�it, proto�e tento podpisovac� kl�� m��e vytvo�it d�v�ru\n"
-"prost�ednictv�m jin�ho ji� certifikovan�ho kl��e."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "Podpis je neplatn�. Je rozumn� ho odstranit z Va�eho souboru kl���."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Toto je podpis, kter� v�e identifik�tor u�ivatele ke kl��i. Obvykle\n"
-"nen� dobr� takov� podpis odstranit. GnuPG nem��e tento kl�� nad�le\n"
-"pou��vat. Ud�lejte to jenom v p��pad�, kdy je tento podpis kl��e\n"
-"j�m sam�m z n�jak�ho d�vodu neplatn� a kdy je k dipozici kl�� jin�."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Zm�nit p�edvolby pro v�echny u�ivatelsk� ID (nebo pouze pro ozna�en�)\n"
-"na aktu�ln� seznam p�edvoleb. �asov� raz�tka v�ech dot�en�ch podpis�\n"
-"kl��� jimi samotn�mi budou posunuty o jednu vte�inu dop�edu.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-"Pros�m, zopakujte posledn� heslo, abyste si byl(a) jist�(�), co jste \n"
-" napsal(a)."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Zadejte n�zev souboru, ke kter�mu se podpis vztahuje"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Pokud si p�ejete p�eps�n� souboru, odpov�zte \"ano\""
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Pros�m, vlo�te nov� n�zev souboru. Pokud pouze stisknete RETURN, bude\n"
-"pou�it implicitn� soubor (kter� je uk�z�n v z�vork�ch)."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"M�l(a) byste specifikovat d�vod certifikace. V z�vislosti na kontextu\n"
-"m�te mo�nost si vybrat ze seznamu:\n"
-"  \"Kl�� byl kompromitov�n\"\n"
-"      Toto pou�ijte, pokud si mysl�te, �e k Va�emu tajn�mu kl��i z�skaly\n"
-"       p��stup neopr�vn�n� osoby.\n"
-"  \"Kl�� je nahrazen\"\n"
-"      Toto pou�ijte, pokud jste tento kl�� nahradil(a) nov�j��m kl��em.\n"
-"  \"Kl�� se ji� nepou��v�\"\n"
-"      Toto pou�ijte, pokud tento kl�� ji� nepou��v�te.\n"
-"  \"Identifik�tor u�ivatele u� nen� platn�\"\n"
-"      Toto pou�ijte, pokud by se identifik�tor u�ivatele u� nem�l pou��vat;\n"
-"      norm�ln� se pou��v� k ozna�en� neplatn� e-mailov� adresy.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Pokud chcete, m��ete vlo�it text popisuj�c� p�vod vzniku tohoto revoka�n�ho\n"
-"ceritifik�tu. Pros�m, stru�n�. \n"
-"Text kon�� pr�zdn�m ��dkem.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Pomoc nen� k dispozici"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc nen� dostupn� pro '%s'"
@@ -2919,13 +2735,13 @@ 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:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
@@ -3014,7 +2830,7 @@ msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 msgid "importing secret keys not allowed\n"
 msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
@@ -3475,8 +3291,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:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
@@ -3487,19 +3303,19 @@ msgstr ""
 "K dispozici je jen kontroln� sou�et kl��e nebo je kl�� na kart� - passphrase "
 "nelze zm�nit.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
@@ -3516,7 +3332,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
@@ -3851,23 +3667,23 @@ msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 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:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3875,71 +3691,71 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3947,17 +3763,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:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -3965,7 +3781,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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3974,74 +3790,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 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:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "neplatn�"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4050,190 +3866,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:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 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:3534
+#: g10/keyedit.c:3535
 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:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden podkl��.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu expirace podkl��e.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu expirace prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, 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:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 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:4147
+#: g10/keyedit.c:4148
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "P�epsat (a/N)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje u�ivatelsk� ID s hashem %s\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podkl�� s indexem %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 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:4659
+#: g10/keyedit.c:4660
 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:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, 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:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Kl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podkl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, 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"
@@ -4273,12 +4089,12 @@ msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
@@ -4304,109 +4120,119 @@ msgstr "�ifrov�n�"
 msgid "Authenticate"
 msgstr "Autentizace"
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Pro kl�� %s lze prov�st: "
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "Aktu�ln� povolen� akce: "
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost �ifrovat\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r DSA kl��� DSA dlouh� %u bit�.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "kl�� %s m��e m�t d�lku v intervalu %u a� %u bit�.\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "velikost kl��e %s mus� b�t v intervalu %u-%u\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4422,7 +4248,7 @@ msgstr ""
 "      <n>m = doba platnosti kl��e skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti kl��e skon�� za n let\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4438,38 +4264,38 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti podpisu skon�� za n let\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� pro? (%s) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "Platnost kl��e nikdy neskon��\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon��\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost kl��e skon�� v %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�� v %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4477,11 +4303,11 @@ msgstr ""
 "V� syst�m neum� zobrazit data po roce 2038.\n"
 "V ka�d�m p��pad� budou data korektn� zpracov�v�na do roku 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4497,44 +4323,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4545,7 +4371,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 
@@ -4560,25 +4386,25 @@ msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zm�nit (J)m�no, (K)oment��, (E)-mail nebo (U)kon�it? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zm�nit (J)m�no, (K)oment��, (E)-mail, (P)okra�ovat d�l nebo (U)kon�it "
 "program? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4586,12 +4412,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4603,7 +4429,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4616,50 +4442,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, 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:3377
+#: g10/keygen.c:3391
 #, 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:3404
+#: g10/keygen.c:3418
 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:3415
+#: g10/keygen.c:3429
 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"
@@ -4667,12 +4493,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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4680,7 +4506,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:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4688,25 +4514,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:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, 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:3891
+#: g10/keygen.c:3905
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, 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"
@@ -5003,198 +4829,198 @@ msgstr "heslo (passphraze) generov�no s pou�it�m nezn�m�ho algoritmu %d\n"
 msgid "public key is %s\n"
 msgstr "ve�ejn� kl�� je %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 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:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, 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:458
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrov�no %s kl��em, ID %s\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrov�n� ve�ejn�m kl��em selhalo: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrov�no s heslem %lu\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrov�no jedn�m heslem\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "p�edpokl�d�m %s �ifrovan�ch dat\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 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:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se za�ifrovanou zpr�vou bylo manipulov�no!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 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:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, 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:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvo�en %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, 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:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "�PATN� podpis od \"%s\""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
@@ -5213,80 +5039,85 @@ msgstr "fstat(%d) selhal v %s: %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� algoritmus ve�ejn�ho kl��e %s\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "VAROV�N�: vy��dan� algoritmus %s nen� doporu�en\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� �ifrovac� algoritmus %s\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VAROV�N�: pou��v�m experiment�ln� hashovac� algoritmus %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VAROV�N�: vy��dan� algoritmus %s nen� doporu�en\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, 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:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, 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:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
@@ -6045,13 +5876,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6059,16 +5890,16 @@ msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
@@ -6390,7 +6221,7 @@ msgstr "absolutn�"
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
@@ -6418,26 +6249,26 @@ msgstr "pros�m prove�te --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracov�no %d kl��� (%d validit vymaz�no)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i %s nebyl nalezen\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "po�adov�no %d ��ste�n� d�v�ry a %d �pln� d�v�ry, model %s\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6445,7 +6276,7 @@ msgstr ""
 "hloubka: %d  platn�ch: %3d  podepsan�ch: %3d  d�v�ra: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 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"
@@ -6586,12 +6417,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
@@ -6652,11 +6483,11 @@ msgstr "verifikace CHV%d se nezda�ila: %s\n"
 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:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
@@ -6764,14 +6595,14 @@ msgstr "podpis %s, hashovac� algoritmus %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 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:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
@@ -6780,7 +6611,7 @@ msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "�tu mo�nosti z `%s'\n"
@@ -6840,22 +6671,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6864,11 +6695,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 msgid "shell"
 msgstr ""
 
@@ -6908,8 +6739,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nelze ulo�it kl��: %s\n"
@@ -7043,61 +6874,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, 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:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikovat podpis"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "duplicita p�edvolby `%s'\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "Revoka�n� certifik�t vytvo�en.\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "�patn� certifik�t"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7112,7 +6943,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7233,6 +7064,112 @@ msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (pouze pro podpis)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (2) �ifrovac� kl��\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, fuzzy, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "Pro kl�� %s lze prov�st: "
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) DSA (pouze pro podpis)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (pouze pro podpis)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(Nebyl zad�n ��dn� popis)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "neplatn� hashovac� algoritmus `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "E-mailov� adresa: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Napi�te identifik�tor u�ivatele (user ID). Ukon�ete pr�zdn�m ��dkem: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Vlo�te nov� n�zev souboru"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "M��ete vlo�it dal�� popis. Ukon�ete pr�zdn�m ��dkem:\n"
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "Vlo�te PIN: "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7266,204 +7203,204 @@ 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:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "register a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zm�nit heslo"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "kontrolovat podpisy"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "nezn�m� �ifrovac� algoritmus"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "nezn�m� komprima�n� algoritmus"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7474,36 +7411,36 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7610,7 +7547,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7629,31 +7566,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Podpis vytvo�en %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Dobr� podpis od \"%s\""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \"%s\""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
@@ -8112,6 +8049,325 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Je na V�s, abyste zde p�i�adil(a) hodnotu; tato hodnota nebude nikdy\n"
+#~ "exportov�na t�et� stran�. Pot�ebujeme ji k implementaci \"pavu�iny\n"
+#~ "d�v�ry\"; nem� to nic spole�n�ho s (implicitn� vytvo�enou) \"pavu�inou\n"
+#~ "certifik�t�\"."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Aby bylo mo�n� vybudovat pavu�inu d�v�ry, mus� GnuPG v�d�t, kter�m "
+#~ "kl���m\n"
+#~ "d�v��ujete absolutn� - obvykle to jsou ty kl��e, pro n� m�te p��stup\n"
+#~ "k tajn�m kl���m. Odpov�zte \"ano\", abyste nastavili tyto kl��e\n"
+#~ "jako absolutn� d�v�ryhodn�\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Pokud p�esto chcete pou��t tento ned�v�ryhodn� kl��, odpov�zte \"ano\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "Vlo�te identifik�tor adres�ta, kter�mu chcete poslat zpr�vu."
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "Vyberte algoritmus, kter� chcete pou��t.\n"
+#~ "\n"
+#~ "DSA (alias DSS) je Digital Signature Algorithm a m��e b�t pou�it pouze "
+#~ "pro\n"
+#~ "podepisov�n�.\n"
+#~ "\n"
+#~ "Elgamal je pouze �ifrovac� algoritmus.\n"
+#~ "\n"
+#~ "RSA m��e b�t pou�it pro �ifrov�n� anebo podepisov�n�.\n"
+#~ "\n"
+#~ "Prvn� (prim�rn�) kl�� mus� b�t v�dy kl��, pomoc� kter�ho lze podepisovat."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "Obecn� nelze doporu�it pou��vat stejn� kl�� pro �ifrov�n� a podepisov�n�\n"
+#~ "Tento algoritmus je vhodn� pou��t jen za jist�ch podm�nek.\n"
+#~ "Kontaktujte pros�m nejprve bezpe�nostn�ho specialistu."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Vlo�te d�lku kl��e"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Odpov�zte \"ano\" nebo \"ne\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Vlo�te po�adovanou hodnotu tak, jak je uvedeno v p��kazov�m ��dku.\n"
+#~ "Je mo�n� vlo�it datum ve form�tu ISO (RRRR-MM-DD), ale nedostanete\n"
+#~ "spr�vnou chybovou hl�ku - m�sto toho syst�m zkus� interpretovat\n"
+#~ "zadanou hodnotu jako interval."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Vlo�te jm�no dr�itele kl��e"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr ""
+#~ "pros�m, vlo�te e-mailovou adresu (nepovinn�, ale velmi doporu�ovan�)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Pros�m, vlo�te nepovinn� koment��"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  pro zm�nu n�zvu.\n"
+#~ "C  pro zm�nu koment��e.\n"
+#~ "E  pro zm�nu e-mailov� adresy.\n"
+#~ "O  pro pokra�ov�n� generov�n� kl��e.\n"
+#~ "Q  pro ukon�en� generov�n� kl��e."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr ""
+#~ "Jestli�e chcete generovat podkl��, odpov�zte \"ano\" (nebo jen \"a\")."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Ne� podep��ete id u�ivatele, m�li byste nejprve ov��it, zda kl��\n"
+#~ "pat�� osob�, jej�� jm�no je uvedeno v identifik�toru u�ivatele.\n"
+#~ "Je velmi u�ite�n�, kdy� ostatn� v�d�, jak d�sledn� jste provedl(a)\n"
+#~ "takov� ov��en�.\n"
+#~ "\n"
+#~ "\"0\" znamen�, �e neuv�d�te, jak d�sledn� jste pravost kl��e ov��il(a) \n"
+#~ "\n"
+#~ "\"1\" znamen�, �e v���te tomu, �e kl�� pat�� osob�, kter� je uvedena,\n"
+#~ "    v u�ivatelsk�m ID, ale nemohl jste nebo jste neprov��il tuto "
+#~ "skute�nost.\n"
+#~ "    To je u�ite�n� pro \"osobn�\" verifikaci, kdy� podepisujete kl��e, "
+#~ "kter�\n"
+#~ "    pou��vaj� pseudonym u�ivatele.\n"
+#~ "\n"
+#~ "\"2\" znamen�, �e jste ��ste�n� ov��il pravost kl��e. Nap�. jste ov��il\n"
+#~ "    fingerprint kl��e a zkontroloval identifik�tor u�ivatele\n"
+#~ "    uveden� na kl��i s fotografick�m id.\n"
+#~ "\n"
+#~ "\"3\" Znamen�, �e jste provedl velmi pe�liv� ov��en� pravosti kl��e.\n"
+#~ "    To m��e nap��klad znamenat, �e jste ov��il fingerprint kl��e \n"
+#~ "    jeho vlastn�ka osobn� a d�le jste pomoc� obt��n� pad�lateln�ho \n"
+#~ "    dokumentu s fotografi� (nap��klad pasu) ov��il, �e jm�no majitele\n"
+#~ "    kl��e se shoduje se jm�nem uveden�m v u�ivatelsk�m ID a d�le jste \n"
+#~ "    ov��il (v�m�nou elektronick�ch dopis�), �e elektronick� adresa "
+#~ "uveden� \n"
+#~ "    v ID u�ivatele pat�� majiteli kl��e.\n"
+#~ "\n"
+#~ "Pros�m nezapome�te, �e p��klady uveden� pro �rove� 2 a 3 jsou *pouze*\n"
+#~ "p��klady.\n"
+#~ "Je jen na Va�em rozhodnut� co \"��ste�n�\" a \"pe�liv�\" ov��en� znamen�\n"
+#~ "kdy� budete podepisovat kl��e jin�m u�ivatel�m.\n"
+#~ "\n"
+#~ "Pokud nev�te, jak� je spr�vn� odpov��, odpov�zte \"0\"."
+
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr ""
+#~ "Pokud chcete podepsat V�ECHNY identifik�tory u�ivatel�, odpov�zte \"ano\""
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Pokud opravdu chcete smazat tento identifik�tor u�ivatele, odpov�zte \"ano"
+#~ "\".\n"
+#~ "V�echny certifik�ty budou tak� ztraceny!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Odpov�zte \"ano\", pokud chcete smazat podkl��"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Toto je platn� podpis kl��e; norm�ln� nechcete tento podpis smazat,\n"
+#~ "proto�e m��e b�t d�le�it� p�i vytv��en� d�v�ry kl��e nebo jin�ho kl��e\n"
+#~ "ceritifikovan�ho t�mto kl��em."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Tento podpis nem��e b�t ov��en, proto�e nem�te odpov�daj�c� ve�ejn� "
+#~ "kl��.\n"
+#~ "Jeho smaz�n� byste m�l(a) odlo�it do doby, ne� budete zn�t, kter� kl��\n"
+#~ "byl pou�it, proto�e tento podpisovac� kl�� m��e vytvo�it d�v�ru\n"
+#~ "prost�ednictv�m jin�ho ji� certifikovan�ho kl��e."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr "Podpis je neplatn�. Je rozumn� ho odstranit z Va�eho souboru kl���."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Toto je podpis, kter� v�e identifik�tor u�ivatele ke kl��i. Obvykle\n"
+#~ "nen� dobr� takov� podpis odstranit. GnuPG nem��e tento kl�� nad�le\n"
+#~ "pou��vat. Ud�lejte to jenom v p��pad�, kdy je tento podpis kl��e\n"
+#~ "j�m sam�m z n�jak�ho d�vodu neplatn� a kdy je k dipozici kl�� jin�."
+
+#~ 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 ""
+#~ "Zm�nit p�edvolby pro v�echny u�ivatelsk� ID (nebo pouze pro ozna�en�)\n"
+#~ "na aktu�ln� seznam p�edvoleb. �asov� raz�tka v�ech dot�en�ch podpis�\n"
+#~ "kl��� jimi samotn�mi budou posunuty o jednu vte�inu dop�edu.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr ""
+#~ "Pros�m, zopakujte posledn� heslo, abyste si byl(a) jist�(�), co jste \n"
+#~ " napsal(a)."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Zadejte n�zev souboru, ke kter�mu se podpis vztahuje"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Pokud si p�ejete p�eps�n� souboru, odpov�zte \"ano\""
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Pros�m, vlo�te nov� n�zev souboru. Pokud pouze stisknete RETURN, bude\n"
+#~ "pou�it implicitn� soubor (kter� je uk�z�n v z�vork�ch)."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "M�l(a) byste specifikovat d�vod certifikace. V z�vislosti na kontextu\n"
+#~ "m�te mo�nost si vybrat ze seznamu:\n"
+#~ "  \"Kl�� byl kompromitov�n\"\n"
+#~ "      Toto pou�ijte, pokud si mysl�te, �e k Va�emu tajn�mu kl��i z�skaly\n"
+#~ "       p��stup neopr�vn�n� osoby.\n"
+#~ "  \"Kl�� je nahrazen\"\n"
+#~ "      Toto pou�ijte, pokud jste tento kl�� nahradil(a) nov�j��m kl��em.\n"
+#~ "  \"Kl�� se ji� nepou��v�\"\n"
+#~ "      Toto pou�ijte, pokud tento kl�� ji� nepou��v�te.\n"
+#~ "  \"Identifik�tor u�ivatele u� nen� platn�\"\n"
+#~ "      Toto pou�ijte, pokud by se identifik�tor u�ivatele u� nem�l "
+#~ "pou��vat;\n"
+#~ "      norm�ln� se pou��v� k ozna�en� neplatn� e-mailov� adresy.\n"
+
+#~ 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 ""
+#~ "Pokud chcete, m��ete vlo�it text popisuj�c� p�vod vzniku tohoto "
+#~ "revoka�n�ho\n"
+#~ "ceritifik�tu. Pros�m, stru�n�. \n"
+#~ "Text kon�� pr�zdn�m ��dkem.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "notaci (notation) nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
@@ -8270,9 +8526,6 @@ msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 #~ msgid "Enter Admin PIN: "
 #~ msgstr "Vlo�te PIN administr�tora: "
 
-#~ msgid "Enter PIN: "
-#~ msgstr "Vlo�te PIN: "
-
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "POZN�MKA: %s nen� v t�to verzi dostupn�\n"
 
@@ -8286,9 +8539,6 @@ msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 #~ msgid "unknown packet type"
 #~ msgstr "nezn�m� typ paketu"
 
-#~ msgid "unknown version"
-#~ msgstr "nezn�m� verze"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "nezn�m� algoritmus ve�ejn�ho kl��e"
 
@@ -8397,9 +8647,6 @@ msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 #~ msgid "network error"
 #~ msgstr "chyba s�t�"
 
-#~ msgid "not encrypted"
-#~ msgstr "neza�ifrov�no"
-
 #~ msgid "not processed"
 #~ msgstr "nezpracov�no"
 
diff --git a/po/da.po b/po/da.po
index 682186e62..e3bd19826 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -40,49 +40,49 @@ msgstr ""
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "d�rlig mpi"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "d�rlig kodes�tning"
@@ -92,21 +92,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -190,8 +190,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -270,7 +270,7 @@ msgid "Please enter the new passphrase"
 msgstr "�ndr kodes�tningen"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -289,13 +289,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "meddelsom"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
@@ -377,8 +377,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
@@ -394,29 +394,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
@@ -526,12 +527,12 @@ msgstr "%s: udelod: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -598,7 +599,7 @@ msgstr ""
 msgid "error opening `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
@@ -623,7 +624,7 @@ msgstr "panser: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -847,6 +848,142 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "certifikatl�seproblem: %s\n"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "Godt certifikat"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "Ingen hj�lp tilg�ngelig"
+
+#: common/audit.c:723
+msgid "Session key created"
+msgstr ""
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "panser: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Underst�ttede algoritmer:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "ikke krypteret"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+msgid "Data verification succeeded"
+msgstr ""
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Denne n�gle er ikke beskyttet.\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "God signatur fra \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "ugyldig hash-algoritme `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Denne n�gle er ikke beskyttet.\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "certifikatl�seproblem: %s\n"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "Godt certifikat"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "Godt certifikat"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "Godt certifikat"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "ukendt version"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Ingen hj�lp tilg�ngelig for `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "fejl i trailerlinie\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -967,13 +1104,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Dit valg? "
 
@@ -1153,7 +1290,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
@@ -1270,18 +1407,18 @@ msgstr ""
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -1322,7 +1459,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -1341,7 +1478,7 @@ msgstr "signering fejlede: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
@@ -1366,7 +1503,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1393,17 +1530,17 @@ msgstr "%s/%s krypteret for: %s\n"
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
@@ -1547,7 +1684,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1562,7 +1699,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1578,27 +1715,27 @@ msgstr "|[filer]|opret en signatur"
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "vis n�gler"
 
@@ -1611,11 +1748,11 @@ msgstr "vis n�gler og signaturer"
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
@@ -1653,11 +1790,11 @@ msgstr "Gener�r en annull�rbar certifikat"
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
@@ -1695,11 +1832,11 @@ msgstr "opdat�r tillidsdatabasen"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1710,32 +1847,32 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
@@ -1751,13 +1888,13 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1796,7 +1933,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1816,12 +1953,12 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1829,7 +1966,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
@@ -1900,474 +2037,474 @@ msgstr ""
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2970
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2976
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:2989
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3094
 #, 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:3048
+#: g10/gpg.c:3096
 #, 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:3051
+#: g10/gpg.c:3099
 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:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3212
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -2382,7 +2519,7 @@ msgstr "Slet denne n�gle fra n�gleringen? "
 msgid "make timestamp conflicts only a warning"
 msgstr "tidsstempelkonflikt"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
@@ -2397,237 +2534,11 @@ msgid ""
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Indtast n�glens st�rrelse"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Svar \"ja\" eller \"nej\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr ""
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr ""
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr ""
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr ""
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr ""
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr ""
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr ""
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr ""
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Svar \"ja\" hvis det er ok at overskrive filen"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Indtast et nyt filnavn. Hvis du bare trykker RETUR vil det\n"
-"forvalgte navn (som er vist i klammer) blive brugt."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
@@ -2821,13 +2732,13 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
@@ -2917,7 +2828,7 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
@@ -3359,8 +3270,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -3369,21 +3280,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
@@ -3398,7 +3309,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
@@ -3763,23 +3674,23 @@ msgstr ""
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3787,370 +3698,370 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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:3020
+#: g10/keyedit.c:3021
 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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 #, 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:3031
+#: g10/keyedit.c:3032
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 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:3366
+#: g10/keyedit.c:3367
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3386
+#: g10/keyedit.c:3387
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3426
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3448
+#: g10/keyedit.c:3449
 #, 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:3467
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, 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:4147
+#: g10/keyedit.c:4148
 #, 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:4209
+#: g10/keyedit.c:4210
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 #, 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:4659
+#: g10/keyedit.c:4660
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, 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:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4194,12 +4105,12 @@ msgid "writing key binding signature\n"
 msgstr ""
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
@@ -4227,109 +4138,119 @@ msgstr "krypt�r data"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4339,7 +4260,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4349,52 +4270,52 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
 # virker j automatisk istedetfor y?
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4404,44 +4325,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4452,7 +4373,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4467,24 +4388,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4492,12 +4413,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4505,7 +4426,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4513,92 +4434,92 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, 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:3349
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
@@ -4907,196 +4828,196 @@ msgstr "ukendt cifferalgoritme "
 msgid "public key is %s\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "krypt�r data"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1615
 #, fuzzy
 msgid "Key available at: "
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -5115,82 +5036,87 @@ msgstr ""
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "uimplementeret cifferalgoritme"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ikke bearbejdet"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
@@ -5941,25 +5867,25 @@ msgstr "Kan ikke tjekke signatur: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:758
+#: g10/sign.c:760
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -6279,7 +6205,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
@@ -6308,32 +6234,32 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6468,12 +6394,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6535,11 +6461,11 @@ msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6652,12 +6578,12 @@ msgstr "%s signatur fra: %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
@@ -6666,7 +6592,7 @@ msgstr "ingen gyldig OpenPGP data fundet.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "l�ser indstillinger fra `%s'\n"
@@ -6729,21 +6655,21 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6752,11 +6678,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "hj�lp"
@@ -6798,8 +6724,8 @@ msgid "number of issuers matching: %d\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
@@ -6932,62 +6858,62 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "Godt certifikat"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "godkend en signatur"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "Godt certifikat"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7002,7 +6928,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7122,6 +7048,107 @@ msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) DSA (sign�r kun)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) ElGamal (krypt�r kun)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) ElGamal (sign�r og krypt�r)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (sign�r kun)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) ElGamal (krypt�r kun)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+msgid "No subject name given\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "ugyldig hash-algoritme `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Epostadresse: "
+
+#: sm/certreqgen-ui.c:235
+msgid " (end with an empty line):\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Indtast nyt filnavn"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+msgid " (optional; end with an empty line):\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "Indtast bruger-id: "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7155,196 +7182,196 @@ msgstr "vis pr�ferencer"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adresser\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "vis hemmelige n�gler"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldigt certifikat"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "opret ascii beskyttet uddata"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7355,36 +7382,36 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "brug: gpg [flag] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7493,7 +7520,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7512,31 +7539,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "God signatur fra \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "skriver selvsignatur\n"
@@ -7993,6 +8020,33 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Indtast n�glens st�rrelse"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Svar \"ja\" eller \"nej\""
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Svar \"ja\" hvis det er ok at overskrive filen"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Indtast et nyt filnavn. Hvis du bare trykker RETUR vil det\n"
+#~ "forvalgte navn (som er vist i klammer) blive brugt."
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "hj�lp"
@@ -8073,10 +8127,6 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 #~ msgstr "Indtast bruger-id: "
 
 #, fuzzy
-#~ msgid "Enter PIN: "
-#~ msgstr "Indtast bruger-id: "
-
-#, fuzzy
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "RSA n�gle kan ikke bruges i denne version\n"
 
@@ -8090,9 +8140,6 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 #~ msgid "unknown packet type"
 #~ msgstr "ukendt pakketype"
 
-#~ msgid "unknown version"
-#~ msgstr "ukendt version"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "ukendt offentlig n�glealgoritme"
 
@@ -8207,9 +8254,6 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 #~ msgid "network error"
 #~ msgstr "netv�rksfejl"
 
-#~ msgid "not encrypted"
-#~ msgstr "ikke krypteret"
-
 #~ msgid "not processed"
 #~ msgstr "ikke bearbejdet"
 
@@ -8475,10 +8519,6 @@ msgstr "valgte cifferalgoritme %d er ugyldig\n"
 #~ msgstr "%08lX: Vi stoler IKKE p� denne n�gle\n"
 
 #, fuzzy
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) ElGamal (sign�r og krypt�r)\n"
-
-#, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "   (%d) DSA (sign�r kun)\n"
 
diff --git a/po/de.po b/po/de.po
index aa3d4b6df..5fa641e6c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # GnuPG german translation
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-#               2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+#               2006, 2007 Free Software Foundation, Inc.
 # Walter Koch <[email protected]>, 1998, 1999, 2000, 2001, 2002, 
 #               2003, 2004, 2005, 2006
 # Merged with the gnupg 1.9.23 translation by Werner Koch on 2006-09-25.
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-12-03 15:04+0100\n"
-"PO-Revision-Date: 2007-11-20 14:43+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+0100\n"
+"PO-Revision-Date: 2007-12-14 16:50+0100\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -45,49 +45,49 @@ msgstr ""
 msgid "Quality:"
 msgstr "Qualität:"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Die Qualität der Passphrase, die Sie oben eingegeben haben.\n"
 "Bitte fragen sie Ihren Systembeauftragten nach den\n"
 "Kriterien für die Messung der Qualität."
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 msgid "Passphrase too long"
 msgstr "Das Mantra (Passphrase) ist zu lang"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz"
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 msgid "Bad PIN"
 msgstr "Falsche PIN"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 msgid "Bad Passphrase"
 msgstr "Falsche Passphrase"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 msgid "Passphrase"
 msgstr "Passphrase"
 
@@ -96,21 +96,21 @@ msgstr "Passphrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -191,8 +191,8 @@ msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren"
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
@@ -284,7 +284,7 @@ msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie die Passphrase ein:"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -301,13 +301,13 @@ msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
@@ -384,8 +384,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
 
@@ -401,29 +401,30 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für GnuPG\n"
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
@@ -532,12 +533,12 @@ msgstr "%s %s angehalten\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "Der gpg-agent läuft nicht für diese Session\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -610,7 +611,7 @@ msgstr "Vom Benutzer abgebrochen\n"
 msgid "error opening `%s': %s\n"
 msgstr "Fehler beim Öffnen von `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "Datei `%s', Zeile %d: %s\n"
@@ -638,7 +639,7 @@ msgstr "fehlerhafter Fingerabdruck in `%s', Zeile %d\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "Ungültiger Schlüsselflag in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
@@ -867,6 +868,128 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr "Kein Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr "Kein aktiver gpg-agent - es wird einer gestarted\n"
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr "Verbindung zum gpg-agent nicht möglich - Ersatzmethode wird versucht\n"
+
+#: common/audit.c:682
+msgid "Certificate chain available"
+msgstr "Zertifikatkette vorhanden"
+
+#: common/audit.c:689
+msgid "root certificate missing"
+msgstr "Das Wurzelzertifikat fehlt"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr "Verschlüsseln der Daten erfolgreich"
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+msgid "Data available"
+msgstr "Daten vorhanden"
+
+#: common/audit.c:723
+msgid "Session key created"
+msgstr "Sitzungsschlüssel erzeugt"
+
+#: common/audit.c:728
+#, c-format
+msgid "algorithm: %s"
+msgstr "Verfahren: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, c-format
+msgid "unsupported algorithm: %s"
+msgstr "Nicht unterstütztes Verfahren: %s"
+
+#: common/audit.c:734
+msgid "seems to be not encrypted"
+msgstr "dies is wahrscheinlich nicht verschlüsselt"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr "Anzahl der Empfänger"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr "Empfänger %d"
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr "Signieren der Daten erfolgreich"
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr "Entschlüsselung der Daten erfolgreich"
+
+#: common/audit.c:821
+msgid "Data verification succeeded"
+msgstr "Prüfung der Signatur erfolgreich"
+
+#: common/audit.c:830
+msgid "Signature available"
+msgstr "Signatur vorhanden"
+
+#: common/audit.c:835
+msgid "Parsing signature succeeded"
+msgstr "Syntaxanalyse der Signatur erfolgreich"
+
+#: common/audit.c:840
+#, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "Ungültiges Hashverfahren: %s"
+
+#: common/audit.c:855
+#, c-format
+msgid "Signature %d"
+msgstr "Signatur %d"
+
+#: common/audit.c:871
+msgid "Certificate chain valid"
+msgstr "Zertifikatkette gültig"
+
+#: common/audit.c:882
+msgid "Root certificate trustworthy"
+msgstr "Wurzelzertifikat vertrauenswürdig"
+
+#: common/audit.c:892
+msgid "CRL/OCSP check of certificates"
+msgstr "CRL/OCSP Prüfung der Zertifikate"
+
+#: common/audit.c:909
+msgid "Included certificates"
+msgstr "Mitgesendete Zertifikate"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr "Keine Einträge in der Audit-Datei"
+
+#: common/audit.c:1014
+msgid "Unknown operation"
+msgstr "Unbekannte Operation"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr "Gpg-Agent benutzbar"
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr "Dirmngr benutzbar"
+
+#: common/audit.c:1078
+#, c-format
+msgid "No help available for `%s'."
+msgstr "Keine Hilfe für '%s' vorhanden."
+
+#: common/helpfile.c:80
+msgid "ignoring garbage line"
+msgstr "Zeile mit nicht identifizierten Zeichen wird ignoriert"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -985,13 +1108,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
@@ -1160,7 +1283,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
@@ -1264,18 +1387,18 @@ msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1318,7 +1441,7 @@ msgstr ""
 "Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@ -1339,7 +1462,7 @@ msgstr "benutze Cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@ -1370,7 +1493,7 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %"
 "s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1401,18 +1524,18 @@ msgstr "%s/%s verschlüsselt für: %s\n"
 msgid "%s encrypted data\n"
 msgstr "%s verschlüsselte Daten\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Warnung: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
 
-#: g10/encr-data.c:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "Problem beim Bearbeiten des verschlüsselten Packets\n"
 
@@ -1558,7 +1681,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1575,7 +1698,7 @@ msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "Schlüssel %s: geheimer Schlüssel ohne öffentlichen Schlüssel - übersprungen\n"
 
-#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1591,27 +1714,27 @@ msgstr "|[Datei]|Eine Unterschrift erzeugen"
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
@@ -1623,11 +1746,11 @@ msgstr "Liste der Schlüssel und ihrer Signaturen"
 msgid "list and check key signatures"
 msgstr "Signaturen der Schlüssel auflisten und prüfen"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
@@ -1663,11 +1786,11 @@ msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
@@ -1703,11 +1826,11 @@ msgstr "Ändern der \"Trust\"-Datenbank"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1718,32 +1841,31 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
-#, fuzzy
+#: g10/gpg.c:466 sm/gpgsm.c:342
 msgid "|FILE|write output to FILE"
-msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
+msgstr "|DATEI|Ausgabe auf DATEI schreiben"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
@@ -1759,7 +1881,7 @@ msgstr "OpenPGP-Verhalten strikt beachten"
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1768,7 +1890,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
 "Optionen)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1808,7 +1930,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1828,19 +1950,19 @@ msgstr "Verschlü.: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
-msgstr ""
+msgstr "Verwendete Bibliotheken:"
 
 #: g10/gpg.c:922
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
@@ -1922,468 +2044,468 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr "Zeige Richtlinien-URL während der Unterschriftenlisten"
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr "Zeige IETF-Standard"
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr "Zeige anwenderseitige Notationen in den Unterschriftenlisten"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Der bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "Die Bibliothek \"libgcrypt\" is zu alt (benötigt wird %s, vorhanden ist %s)\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, 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:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr "Zeige die Foto-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen wahrend der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr "Zeie anwenderseitige Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 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:2582
+#: g10/gpg.c:2621
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 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:2586
+#: g10/gpg.c:2625
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Hauptuser-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 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:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfuns-Option.\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, 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:2782
+#: g10/gpg.c:2821
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 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:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 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:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
@@ -2395,7 +2517,7 @@ msgstr "Schlüssel aus diesem Schlüsselbund nehmen"
 msgid "make timestamp conflicts only a warning"
 msgstr "differierende Zeitangaben sind kein Fehler"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
@@ -2409,354 +2531,11 @@ msgid ""
 "Check signatures against known trusted keys\n"
 msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h Hilfe)\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Sie müssen selbst entscheiden, welchen Wert Sie hier eintragen; dieser Wert\n"
-"wird niemals an eine dritte Seite weitergegeben.  Wir brauchen diesen Wert,\n"
-"um das \"Netz des Vertrauens\" aufzubauen.  Dieses hat nichts mit dem\n"
-"(implizit erzeugten) \"Netz der Zertifikate\" zu tun."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Um das Web-of-Trust aufzubauen muß GnuPG wissen, welchen Schlüsseln\n"
-"uneingeschränkt vertraut wird. Das sind üblicherweise die Schlüssel\n"
-"auf deren geheimen Schlüssel Sie Zugruff haben.\n"
-"Antworten Sie mit \"yes\" um diesen Schlüssel uneingeschränkt zu vertrauen\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Wenn Sie diesen nicht vertrauenswürdigen Schlüssel trotzdem benutzen "
-"wollen,\n"
-"so antworten Sie mit \"ja\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Geben Sie die User-ID dessen ein, dem Sie die Botschaft senden wollen."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"Wählen Sie das zu verwendene Verfahren.\n"
-"\n"
-"DSA (alias DSS) ist der \"Digital Signature Algorithm\" und kann nur für\n"
-"Unterschriften genutzt werden.\n"
-"\n"
-"Elgamal ist ein Verfahren nur für Verschlüsselung.\n"
-"\n"
-"RSA kann sowohl für Unterschriften als auch für Verschlüsselung genutzt\n"
-"werden.\n"
-"\n"
-"Der erste Schlüssel (Hauptschlüssel) muß immer ein Schlüssel sein, mit dem\n"
-"unterschrieben werden kann."
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"Normalerweise ist es nicht gut, denselben Schlüssel zum unterschreiben\n"
-"und verschlüsseln zu nutzen.  Dieses Verfahren sollte in speziellen\n"
-"Anwendungsgebiten benutzt werden.  Bitte lassen Sie sich zuerst von \n"
-"einem Sicherheistexperten beraten."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Wählen Sie die gewünschte Schlüssellänge"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Geben Sie \"ja\" oder \"nein\" ein"
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Geben Sie den benötigten Wert so an, wie er im Prompt erscheint.\n"
-"Es ist zwar möglich ein \"ISO\"-Datum (JJJJ-MM-DD) einzugeben, aber man\n"
-"erhält dann ggfs. keine brauchbaren Fehlermeldungen - stattdessen versucht\n"
-"der Rechner den Wert als Intervall (von-bis) zu deuten."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Geben Sie den Namen des Schlüsselinhabers ein"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr ""
-"Geben Sie eine Email-Adresse ein. Dies ist zwar nicht unbedingt notwendig,\n"
-"aber sehr empfehlenswert."
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Geben Sie - bei Bedarf - einen Kommentar ein"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  um den Namen zu ändern.\n"
-"K  um den Kommentar zu ändern.\n"
-"E  um die Email-Adresse zu ändern.\n"
-"F  um mit der Schlüsselerzeugung fortzusetzen.\n"
-"B  um die Schlüsselerzeugung abbrechen."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr ""
-"Geben Sie \"ja\" (oder nur \"j\") ein, um den Unterschlüssel zu erzeugen."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Wenn Sie die User-ID eines Schlüssels beglaubigen wollen, sollten Sie "
-"zunächst\n"
-"sicherstellen, daß der Schlüssel demjenigen gehört, der in der User-ID "
-"genannt\n"
-"ist. Für Dritte ist es hilfreich zu wissen, wie gut diese Zuordnung "
-"überprüft\n"
-"wurde.\n"
-"\n"
-"\"0\" zeigt, daß Sie keine bestimmte Aussage über die Sorgfalt der \n"
-"    Schlüsselzuordnung machen.\n"
-"\n"
-"\"1\" Sie glauben, daß der Schlüssel der benannten Person gehört,\n"
-"    aber Sie konnten oder nahmen die Überpüfung überhaupt nicht vor.\n"
-"    Dies ist hilfreich für eine \"persona\"-Überprüfung, wobei man den\n"
-"    Schlüssel eines Pseudonym-Trägers beglaubigt\n"
-"\n"
-"\"2\" Sie nahmen eine flüchtige Überprüfung vor. Das heißt Sie haben z.B.\n"
-"    den Schlüsselfingerabdruck kontrolliert und die User-ID des Schlüssels\n"
-"    anhand des Fotos geprüft.\n"
-"\n"
-"\"3\" Sie haben eine ausführlich Kontrolle des Schlüssels vorgenommen.\n"
-"    Das kann z.B. die Kontrolle des Schlüsselfingerabdrucks mit dem\n"
-"    Schlüsselinhaber persönlich vorgenommen haben; daß Sie die User-ID des\n"
-"    Schlüssel anhand einer schwer zu fälschenden Urkunde mit Foto (wie z.B.\n"
-"    einem Paß) abgeglichen haben und schließlich per Email-Verkehr die\n"
-"    Email-Adresse als zum Schlüsselbesitzer gehörig erkannt haben.\n"
-"\n"
-"Beachten Sie, daß diese Beispiele für die Antworten 2 und 3 *nur* Beispiele\n"
-"sind.  Schlußendlich ist es Ihre Sache, was Sie unter \"flüchtig\" oder\n"
-" \"ausführlich\" verstehen, wenn Sie Schlüssel Dritter beglaubigen.\n"
-"\n"
-"Wenn Sie nicht wissen, wie Sie antworten sollen, wählen Sie \"0\"."
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Geben Sie \"ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Geben Sie \"ja\" (oder nur \"j\") ein, um diese User-ID zu LÖSCHEN.\n"
-"Alle Zertifikate werden dann auch weg sein!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr ""
-"Geben Sie \"ja\" (oder nur \"j\") ein, um diesen Unterschlüssel zu löschen"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Dies ist eine gültige Beglaubigung für den Schlüssel. Es ist normalerweise\n"
-"unnötig sie zu löschen. Sie ist möglicherweise sogar notwendig, um einen\n"
-"Trust-Weg zu diesem oder einem durch diesen Schlüssel beglaubigten "
-"Schlüssel\n"
-"herzustellen."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Diese Beglaubigung kann nicht geprüft werden, da Sie den passenden "
-"Schlüssel\n"
-"nicht besitzen. Sie sollten die Löschung der Beglaubigung verschieben, bis\n"
-"sie wissen, welcher Schlüssel verwendet wurde. Denn vielleicht würde genau\n"
-"diese Beglaubigung den \"Trust\"-Weg komplettieren."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-"Diese Beglaubigung ist ungültig. Es ist sinnvoll sie aus Ihrem\n"
-"Schlüsselbund zu entfernen."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Diese Beglaubigung bindet die User-ID an den Schlüssel. Normalerweise ist\n"
-"es nicht gut, solche Beglaubigungen zu entfernen. Um ehrlich zu sein:\n"
-"Es könnte dann sein, daß GnuPG diesen Schlüssel gar nicht mehr benutzen "
-"kann.\n"
-"Sie sollten diese Eigenbeglaubigung also nur dann entfernen, wenn sie aus\n"
-"irgendeinem Grund nicht gültig ist und eine zweite Beglaubigung verfügbar "
-"ist."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Ändern der Voreinstellung aller User-IDs (oder nur der ausgewählten)\n"
-"auf die aktuelle Liste der Voreinstellung. Die Zeitangaben aller "
-"betroffenen\n"
-"Eigenbeglaubigungen werden um eine Sekunde vorgestellt.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Bitte geben Sie die Passphrase ein. Dies ist ein geheimer Satz \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-"Um sicher zu gehen, daß Sie sich bei der Eingabe der Passphrase nicht\n"
-"vertippt haben, geben Sie diese bitte nochmal ein.  Nur wenn beide Eingaben\n"
-"übereinstimmen, wird die Passphrase akzeptiert."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr ""
-"Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift gehört"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei überschreiben möchten"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Geben Sie bitte einen neuen Dateinamen ein. Falls Sie nur die\n"
-"Eingabetaste betätigen, wird der (in Klammern angezeigte) Standarddateiname\n"
-"verwendet."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Sie sollten einen Grund für die Zertifizierung angeben. Je nach\n"
-"Zusammenhang können Sie aus dieser Liste auswählen:\n"
-"  \"Schlüssel wurde kompromitiert\"\n"
-"      Falls Sie Grund zu der Annahme haben, daß nicht berechtigte Personen\n"
-"      Zugriff zu Ihrem geheimen Schlüssel hatten\n"
-"  \"Schlüssel ist überholt\"\n"
-"      Falls Sie diesen Schlüssel durch einem neuen ersetzt haben.\n"
-"  \"Schlüssel wird nicht mehr benutzt\"\n"
-"      Falls Sie diesen Schlüssel zurückgezogen haben.\n"
-"  \"User-ID ist nicht mehr gültig\"\n"
-"      Um bekanntzugeben, daß die User-ID nicht mehr benutzt werden soll.\n"
-"      So weist man normalerweise auf eine ungültige Emailadresse hin.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Wenn Sie möchten, können Sie hier einen Text eingeben, der darlegt, warum\n"
-"Sie diesen Widerruf herausgeben.  Der Text sollte möglichst knapp sein.\n"
-"Eine Leerzeile beendet die Eingabe.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Keine Hilfe vorhanden."
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe für '%s' vorhanden."
@@ -2955,13 +2734,13 @@ 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:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
@@ -3052,7 +2831,7 @@ msgstr ""
 msgid "importing secret keys not allowed\n"
 msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schlüsselbund: %s\n"
@@ -3526,8 +3305,8 @@ msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -3538,19 +3317,19 @@ msgstr ""
 "Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schüsselelemente- keine "
 "Passphrase ist zu ändern.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Haupschlüssels sind auf der Karte gespeichert.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "Schlüssel ist geschützt.\n"
 
@@ -3567,7 +3346,7 @@ msgstr ""
 "Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
@@ -3909,92 +3688,92 @@ msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Bevorzugter Schlüsselserver:"
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 msgid "Notations: "
 msgstr "\"Notationen\": "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:2698
+#: g10/keyedit.c:2699
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Dieser Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2720
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Dieser Schlüssel könnte durch %s mit Schlüssel %s  widerrufen worden sein"
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "erzeugt: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "widerrufen: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "verfallen: %s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "Aufruf: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "Vertrauen: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "Gültigkeit: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr "Kartennummer:"
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4002,18 +3781,18 @@ msgstr ""
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "widerrufen"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "verfallen"
 
 # translated by wk
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4021,7 +3800,7 @@ msgstr ""
 "WARNUNG: Keine User-ID ist als primär markiert.  Dieser Befehl kann\n"
 "dazu führen, daß eine andere User-ID as primär angesehen wird.\n"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4031,74 +3810,74 @@ msgstr ""
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie können einem PGP2-artigen SchlüÂüsel keine Foto-ID hinzufügen.\n"
 
-#: g10/keyedit.c:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "ungültig"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User-ID \"%s\": %d Signatur entfernt\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User-ID \"%s\": %d Signaturen entfernt\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User-ID \"%s\": bereits minimiert\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User-ID \"%s\": bereits sauber\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4108,198 +3887,198 @@ msgstr ""
 "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
 "         des Schlüssels führen.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie können einem PGP2-artigen SchlüÂüsel keine vorgesehenen Widerrufer "
 "hinzufügen.\n"
 
-#: g10/keyedit.c:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:3426
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:3448
+#: g10/keyedit.c:3449
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht rückgangig gemacht werden!\n"
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3474
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer festlegen? "
 "(j/N): "
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "Bitte wählen Sie höchstens einen Unterschlüssel aus.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "Unterschlüssel %s ist des Unterschreibens nicht mächtig und braucht deshalb "
 "keine Rücksignatur\n"
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 msgid "Enter the notation: "
 msgstr "Geben Sie die \"Notation\" ein: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 msgid "Proceed? (y/N) "
 msgstr "Fortfahren (j/N)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Hash %s\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kein Unterschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \"%s\"\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch Ihren Schlüssel %s am %s%s%s\n"
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs des Schlüssels %s beglaubigt:\n"
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (unwiderrufbar)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Schlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Unterschlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
@@ -4339,12 +4118,12 @@ msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
@@ -4372,109 +4151,119 @@ msgstr "Verschl."
 msgid "Authenticate"
 msgstr "Authentisierung"
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "UuVvAaQq"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Mögliche Vorgänge eines %s-Schlüssels: "
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "Derzeit erlaubte Vorgänge: "
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Umschalten der Unterschreibfähigkeit\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Umschalten der Verschlüsselungsfähigkeit\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Umschalten der Authentisierungsfähigkeit\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Beenden\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA und Elgamal (voreingestellt)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur unterschreiben/beglaubigen)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (Leistungsfähigkeit selber einstellbar)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Das DSA-Schlüsselpaar wird %u Bit haben.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-Schlüssel können zwischen %u und %u Bit lang sein.\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4490,7 +4279,7 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4506,38 +4295,38 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "Schlüssel verfällt nie\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "Signature verfällt nie\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verfällt am %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Unterschrift verfällt am %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4545,11 +4334,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4565,44 +4354,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Email-Adresse: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Diese Email-Adresse ist ungültig\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4613,7 +4402,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 
@@ -4628,23 +4417,23 @@ msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4652,12 +4441,12 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4670,7 +4459,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4681,50 +4470,50 @@ msgstr ""
 "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schlüssel-\"stub\"s nach `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 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"
@@ -4733,12 +4522,12 @@ msgstr ""
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Unterschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4746,7 +4535,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4754,25 +4543,25 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschlüssel für v3-Schlüssen sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? (j/N) "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "Speicher des Schlüssels auf der Karte schlug fehl: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
@@ -5076,196 +4865,196 @@ msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
 msgid "public key is %s\n"
 msgstr "Öffentlicher Schlüssel ist %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %s, erzeugt %s\n"
 
-#: g10/mainproc.c:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, 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:458
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschlüsselt mit %lu Passphrases\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschlüsselt mit einer Passphrase\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschlüsselte Daten\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-Verschlüsselung nicht verfügbar; versucht wird stattdessen %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "Entschlüsselung erfolgreich\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 msgid "no signature found\n"
 msgstr "Keine Unterschrift gefunden\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-Überprüfung unterdrückt\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese mehrdeutige Unterschriftdaten können nicht bearbeitet werden\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Unterschrift vom %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               mittels %s-Schlüssel %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Unterschrift vom %s mittels %s-Schlüssel ID %s\n"
 
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Unterschrift von \"%s\""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Unterschrift von \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Unterschrift von \"%s\""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \"%s\""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verfällt am %s.\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "Binäre"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste geprüft.\n"
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
@@ -5284,81 +5073,87 @@ msgstr "fstat(%d) schlug fehl in %s: %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "WARNUNG: Verwendung des experimentellen Public-Key-Verfahrens %s\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr ""
+"WARNUNG: Die Verwendung von Elgamal sign+encrypt Schlüsseln ist nicht "
+"ratsam\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "WARNING: Verwendung des experimentellen Verschlüsselungsverfahren %s\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "WARNUNG: Verwendung des experimentellen Hashverfahrens %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "Siehe %s für weitere Infos\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, 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:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannte Option '%s'\n"
@@ -6149,13 +5944,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6163,17 +5958,17 @@ msgstr ""
 "WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
 "Empfängervoreinstellungen\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschlüsselung wird verwendet\n"
@@ -6499,7 +6294,7 @@ msgstr "uneingeschränkt"
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
@@ -6528,27 +6323,27 @@ msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird überprüft\n"
 
 # translated by wk
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d Schlüssel verarbeitet (%d Validity Zähler gelöscht)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "keine uneingeschränkt vertrauenswürdige Schlüssel gefunden\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "öff.Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal-needed, %d complete-needed, %s Vertrauensmodell\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6556,7 +6351,7 @@ msgstr ""
 "Tiefe: %d  gültig: %3d  unterschrieben: %3d  Vertrauen: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6690,12 +6485,12 @@ msgstr ""
 "Syntax: kbxutil [Optionen] [Dateien]\n"
 "Anlistem exportieren und Importieren von KeyBox Dateien\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Bitte die PIN auf der Tastatur des Kartenleser eingeben"
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
@@ -6758,11 +6553,11 @@ msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
@@ -6869,14 +6664,14 @@ msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "Die Überprüfung der Admin PIN is momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -6885,7 +6680,7 @@ msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
 msgid "run in multi server mode (foreground)"
 msgstr "Im Multiserver Modus ausführen"
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 msgid "read options from file"
 msgstr "Konfigurationsoptionen aus Datei lesen"
 
@@ -6946,21 +6741,21 @@ msgstr "Handhabungsroutine für den fd %d beendet\n"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ungültiges Basis-64 Zeichen %02X wurde übersprungen\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "Kein aktiver Dirmngr - `%s' wird einer gestartet\n"
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "Die Variable DIRMNGR_INFO ist fehlerhaft\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "Die Dirmngr Protokollversion %d wird nicht unterstützt\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 "Verbindung zum Dirmngr kann nicht aufgebaut werden - Ersatzmethode wird "
@@ -6971,11 +6766,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr "Durch Zertifikat angefordertes Gültigkeitsmodell: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr "Kette"
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 msgid "shell"
 msgstr "Schale"
 
@@ -7014,8 +6809,8 @@ msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
 msgid "number of issuers matching: %d\n"
 msgstr "Anzahl der übereinstimmenden Herausgeber: %d\n"
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
 
@@ -7145,59 +6940,59 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "Im Zertifikat ist kein Herausgeber enthalten"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "Der Zertifikatkette ist zu lang\n"
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr "Herausgeberzertifikat nicht gefunden"
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 msgid "certificate has a BAD signature"
 msgstr "Das Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
 "nochmal"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 msgid "certificate is good\n"
 msgstr "Das Zertifikat ist korrekt\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 msgid "intermediate certificate is good\n"
 msgstr "Das Zwischenzertifikat ist korrekt\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 msgid "root certificate is good\n"
 msgstr "Das Wurzelzertifikat ist korrekt\n"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr "Umgeschaltet auf das Kettenmodell"
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr "Benutztes Gültigkeitsmodell: %s"
@@ -7213,7 +7008,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 "Ein %u-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(Dies ist der MD2 Algorithmus)\n"
 
@@ -7335,6 +7130,105 @@ msgstr "Zeile %d: Fehler beim Holen des Schlüssels per \"Keygrip\" `%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Zeile %d: Schlüsselerzeugung schlug fehl: %s <%s>\n"
 
+#: sm/certreqgen-ui.c:122
+#, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA\n"
+
+#: sm/certreqgen-ui.c:123
+#, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) Vorhandener Schlüssel\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr "   (%d) Vorhandener Schlüssel auf der Karte\n"
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "Mögliche Vorgänge eines %s-Schlüssels:\n"
+
+#: sm/certreqgen-ui.c:177
+#, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) unterschreiben, verschlüsseln\n"
+
+#: sm/certreqgen-ui.c:178
+#, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) unterschreiben\n"
+
+#: sm/certreqgen-ui.c:179
+#, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) verschlüsseln\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr "Bitte geben sie den Namen des X.508 Subjekts ein: "
+
+#: sm/certreqgen-ui.c:207
+msgid "No subject name given\n"
+msgstr "Kein Subject-Name angegeben\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr "Ungültiger Subject-Name-Label `%.*s'\n"
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "Ungültiger Subject-Name `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr "25"
+
+#: sm/certreqgen-ui.c:234
+msgid "Enter email addresses"
+msgstr "Email-Adresse eingeben"
+
+#: sm/certreqgen-ui.c:235
+msgid " (end with an empty line):\n"
+msgstr " (Beenden mit einer leeren Zeile):\n"
+
+#: sm/certreqgen-ui.c:239
+msgid "Enter DNS names"
+msgstr "DNS Namen eingeben"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+msgid " (optional; end with an empty line):\n"
+msgstr " (Optional. Beenden mit einer leeren Zeile):\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr "Bitte geben Sie die URIs ein"
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr "Parameter die für die Zertifikatsanforderung benutzt werden sollen:\n"
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+"Die Zertifikatsanforderung wird erzeugt.  Dies kann einen Moment dauern ...\n"
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr "Fertig.  Sie sollten nun diese Anforderung an die CA senden.\n"
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr "Resourcenproblem: Nicht genügend Hauptspeicher\n"
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(Dies ist der RC-2 Algorithmus)\n"
@@ -7368,187 +7262,185 @@ msgstr "Zertifikat `%s' gelöscht\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 msgid "no valid recipients given\n"
 msgstr "Keine gültigen Empfänger angegeben\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 msgid "|[FILE]|make a signature"
 msgstr "|[DATEI]|Erzeuge eine Signatur"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[DATEI]|Erzeuge eine Klartextsignatur"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 msgid "list external keys"
 msgstr "Externe Schlüssel anzeigen"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 msgid "list certificate chain"
 msgstr "Schlüssel mit Zertifikatekette anzeigen"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 msgid "remove key from the public keyring"
 msgstr "Schlüssel aus dem öffentlichen Schlüsselbund löschen"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 msgid "import certificates"
 msgstr "Zertifikate importieren"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 msgid "export certificates"
 msgstr "Zertifikate exportieren"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr "Smartcard registrieren"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr "Das Kommand an den Dirmngr durchreichen"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr "Rufe das gpg-protect-tool auf"
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 msgid "change a passphrase"
 msgstr "Die Passphrase ändern"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 msgid "create base-64 encoded output"
 msgstr "Ausgabe im Basis-64 format erzeugen"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr "Eingabedaten sind im PEM Format"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr "Eingabedaten sind im Basis-64 Format"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr "Eingabedaten sind im Binärformat"
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr "Benutze den System Dirmngr falls verfügbar"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr "|N|Sende N Zertifikate mit"
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr "Zertikikatrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr "Fehlende Zertifikate automatisch holen"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschlüssel als voreingestellten\n"
 "Empfänger benutzen"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: sm/gpgsm.c:345
-#, fuzzy
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: sm/gpgsm.c:347
-#, fuzzy
+#: sm/gpgsm.c:348
 msgid "|FILE|write an audit log to FILE"
-msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
+msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Aufruf: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7557,35 +7449,35 @@ msgstr ""
 "Syntax: gpgsm [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 msgid "usage: gpgsm [options] "
 msgstr "Aufruf: gpgsm [Optionen] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr "Dieser Befehl wurde noch nicht implementiert\n"
 
@@ -7697,7 +7589,7 @@ msgstr ""
 "\n"
 "%s%sSind Sie wirklich sicher, daß Sie dies möchten?"
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7722,28 +7614,28 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Prüfung auf ein qualifiziertes Zertifikats fehlgeschlagen: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 msgid "Signature made "
 msgstr "Signatur erzeugt am "
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr "[Datum nicht vorhanden]"
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr " mittels Zertifikat ID 0x%08lX\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 msgid "Good signature from"
 msgstr "Korrekte Signatur von"
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 msgid "                aka"
 msgstr "                alias"
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 msgid "This is a qualified signature\n"
 msgstr "Dies ist eine qualifizierte Unterschrift.\n"
 
@@ -7772,13 +7664,12 @@ msgid "do not use extended connect mode"
 msgstr "Den \"extended connect\"-Modus nicht nutzen"
 
 #: tools/gpg-connect-agent.c:74
-#, fuzzy
 msgid "|FILE|run commands from FILE on startup"
-msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
+msgstr "|DATEI|Beim Starten Kommandos aus DATEI lesen"
 
 #: tools/gpg-connect-agent.c:75
 msgid "run /subst on startup"
-msgstr ""
+msgstr "Nach dem Starten \"/subst\" ausführen"
 
 #: tools/gpg-connect-agent.c:174
 msgid "Usage: gpg-connect-agent [options] (-h for help)"
@@ -7972,9 +7863,8 @@ msgid "apply global default values"
 msgstr "Wende die gobalen Voreinstellungen an"
 
 #: tools/gpgconf.c:65
-#, fuzzy
 msgid "list global configuration file"
-msgstr "Prüfe die globale Konfigurationsdatei"
+msgstr "Zeige die globale Konfigurationsdatei an"
 
 #: tools/gpgconf.c:67
 msgid "check global configuration file"
@@ -8189,6 +8079,360 @@ msgstr "keine Klasse angegeben\n"
 msgid "class %s is not supported\n"
 msgstr "Klasse %s wird nicht unterstützt\n"
 
+#: tools/gpg-check-pattern.c:145
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Aufruf: gpg-check-pattern [Optionen] Musterdatei  (-h für Hilfe)\n"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
+"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Sie müssen selbst entscheiden, welchen Wert Sie hier eintragen; dieser "
+#~ "Wert\n"
+#~ "wird niemals an eine dritte Seite weitergegeben.  Wir brauchen diesen "
+#~ "Wert,\n"
+#~ "um das \"Netz des Vertrauens\" aufzubauen.  Dieses hat nichts mit dem\n"
+#~ "(implizit erzeugten) \"Netz der Zertifikate\" zu tun."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Um das Web-of-Trust aufzubauen muß GnuPG wissen, welchen Schlüsseln\n"
+#~ "uneingeschränkt vertraut wird. Das sind üblicherweise die Schlüssel\n"
+#~ "auf deren geheimen Schlüssel Sie Zugruff haben.\n"
+#~ "Antworten Sie mit \"yes\" um diesen Schlüssel uneingeschränkt zu "
+#~ "vertrauen\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Wenn Sie diesen nicht vertrauenswürdigen Schlüssel trotzdem benutzen "
+#~ "wollen,\n"
+#~ "so antworten Sie mit \"ja\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr ""
+#~ "Geben Sie die User-ID dessen ein, dem Sie die Botschaft senden wollen."
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "Wählen Sie das zu verwendene Verfahren.\n"
+#~ "\n"
+#~ "DSA (alias DSS) ist der \"Digital Signature Algorithm\" und kann nur für\n"
+#~ "Unterschriften genutzt werden.\n"
+#~ "\n"
+#~ "Elgamal ist ein Verfahren nur für Verschlüsselung.\n"
+#~ "\n"
+#~ "RSA kann sowohl für Unterschriften als auch für Verschlüsselung genutzt\n"
+#~ "werden.\n"
+#~ "\n"
+#~ "Der erste Schlüssel (Hauptschlüssel) muß immer ein Schlüssel sein, mit "
+#~ "dem\n"
+#~ "unterschrieben werden kann."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "Normalerweise ist es nicht gut, denselben Schlüssel zum unterschreiben\n"
+#~ "und verschlüsseln zu nutzen.  Dieses Verfahren sollte in speziellen\n"
+#~ "Anwendungsgebiten benutzt werden.  Bitte lassen Sie sich zuerst von \n"
+#~ "einem Sicherheistexperten beraten."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Wählen Sie die gewünschte Schlüssellänge"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Geben Sie \"ja\" oder \"nein\" ein"
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Geben Sie den benötigten Wert so an, wie er im Prompt erscheint.\n"
+#~ "Es ist zwar möglich ein \"ISO\"-Datum (JJJJ-MM-DD) einzugeben, aber man\n"
+#~ "erhält dann ggfs. keine brauchbaren Fehlermeldungen - stattdessen "
+#~ "versucht\n"
+#~ "der Rechner den Wert als Intervall (von-bis) zu deuten."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Geben Sie den Namen des Schlüsselinhabers ein"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr ""
+#~ "Geben Sie eine Email-Adresse ein. Dies ist zwar nicht unbedingt "
+#~ "notwendig,\n"
+#~ "aber sehr empfehlenswert."
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Geben Sie - bei Bedarf - einen Kommentar ein"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  um den Namen zu ändern.\n"
+#~ "K  um den Kommentar zu ändern.\n"
+#~ "E  um die Email-Adresse zu ändern.\n"
+#~ "F  um mit der Schlüsselerzeugung fortzusetzen.\n"
+#~ "B  um die Schlüsselerzeugung abbrechen."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr ""
+#~ "Geben Sie \"ja\" (oder nur \"j\") ein, um den Unterschlüssel zu erzeugen."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Wenn Sie die User-ID eines Schlüssels beglaubigen wollen, sollten Sie "
+#~ "zunächst\n"
+#~ "sicherstellen, daß der Schlüssel demjenigen gehört, der in der User-ID "
+#~ "genannt\n"
+#~ "ist. Für Dritte ist es hilfreich zu wissen, wie gut diese Zuordnung "
+#~ "überprüft\n"
+#~ "wurde.\n"
+#~ "\n"
+#~ "\"0\" zeigt, daß Sie keine bestimmte Aussage über die Sorgfalt der \n"
+#~ "    Schlüsselzuordnung machen.\n"
+#~ "\n"
+#~ "\"1\" Sie glauben, daß der Schlüssel der benannten Person gehört,\n"
+#~ "    aber Sie konnten oder nahmen die Überpüfung überhaupt nicht vor.\n"
+#~ "    Dies ist hilfreich für eine \"persona\"-Überprüfung, wobei man den\n"
+#~ "    Schlüssel eines Pseudonym-Trägers beglaubigt\n"
+#~ "\n"
+#~ "\"2\" Sie nahmen eine flüchtige Überprüfung vor. Das heißt Sie haben z."
+#~ "B.\n"
+#~ "    den Schlüsselfingerabdruck kontrolliert und die User-ID des "
+#~ "Schlüssels\n"
+#~ "    anhand des Fotos geprüft.\n"
+#~ "\n"
+#~ "\"3\" Sie haben eine ausführlich Kontrolle des Schlüssels vorgenommen.\n"
+#~ "    Das kann z.B. die Kontrolle des Schlüsselfingerabdrucks mit dem\n"
+#~ "    Schlüsselinhaber persönlich vorgenommen haben; daß Sie die User-ID "
+#~ "des\n"
+#~ "    Schlüssel anhand einer schwer zu fälschenden Urkunde mit Foto (wie z."
+#~ "B.\n"
+#~ "    einem Paß) abgeglichen haben und schließlich per Email-Verkehr die\n"
+#~ "    Email-Adresse als zum Schlüsselbesitzer gehörig erkannt haben.\n"
+#~ "\n"
+#~ "Beachten Sie, daß diese Beispiele für die Antworten 2 und 3 *nur* "
+#~ "Beispiele\n"
+#~ "sind.  Schlußendlich ist es Ihre Sache, was Sie unter \"flüchtig\" oder\n"
+#~ " \"ausführlich\" verstehen, wenn Sie Schlüssel Dritter beglaubigen.\n"
+#~ "\n"
+#~ "Wenn Sie nicht wissen, wie Sie antworten sollen, wählen Sie \"0\"."
+
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr ""
+#~ "Geben Sie \"ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Geben Sie \"ja\" (oder nur \"j\") ein, um diese User-ID zu LÖSCHEN.\n"
+#~ "Alle Zertifikate werden dann auch weg sein!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr ""
+#~ "Geben Sie \"ja\" (oder nur \"j\") ein, um diesen Unterschlüssel zu löschen"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Dies ist eine gültige Beglaubigung für den Schlüssel. Es ist "
+#~ "normalerweise\n"
+#~ "unnötig sie zu löschen. Sie ist möglicherweise sogar notwendig, um einen\n"
+#~ "Trust-Weg zu diesem oder einem durch diesen Schlüssel beglaubigten "
+#~ "Schlüssel\n"
+#~ "herzustellen."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Diese Beglaubigung kann nicht geprüft werden, da Sie den passenden "
+#~ "Schlüssel\n"
+#~ "nicht besitzen. Sie sollten die Löschung der Beglaubigung verschieben, "
+#~ "bis\n"
+#~ "sie wissen, welcher Schlüssel verwendet wurde. Denn vielleicht würde "
+#~ "genau\n"
+#~ "diese Beglaubigung den \"Trust\"-Weg komplettieren."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "Diese Beglaubigung ist ungültig. Es ist sinnvoll sie aus Ihrem\n"
+#~ "Schlüsselbund zu entfernen."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Diese Beglaubigung bindet die User-ID an den Schlüssel. Normalerweise "
+#~ "ist\n"
+#~ "es nicht gut, solche Beglaubigungen zu entfernen. Um ehrlich zu sein:\n"
+#~ "Es könnte dann sein, daß GnuPG diesen Schlüssel gar nicht mehr benutzen "
+#~ "kann.\n"
+#~ "Sie sollten diese Eigenbeglaubigung also nur dann entfernen, wenn sie "
+#~ "aus\n"
+#~ "irgendeinem Grund nicht gültig ist und eine zweite Beglaubigung verfügbar "
+#~ "ist."
+
+#~ 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 ""
+#~ "Ändern der Voreinstellung aller User-IDs (oder nur der ausgewählten)\n"
+#~ "auf die aktuelle Liste der Voreinstellung. Die Zeitangaben aller "
+#~ "betroffenen\n"
+#~ "Eigenbeglaubigungen werden um eine Sekunde vorgestellt.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Bitte geben Sie die Passphrase ein. Dies ist ein geheimer Satz \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr ""
+#~ "Um sicher zu gehen, daß Sie sich bei der Eingabe der Passphrase nicht\n"
+#~ "vertippt haben, geben Sie diese bitte nochmal ein.  Nur wenn beide "
+#~ "Eingaben\n"
+#~ "übereinstimmen, wird die Passphrase akzeptiert."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr ""
+#~ "Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift "
+#~ "gehört"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei überschreiben möchten"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Geben Sie bitte einen neuen Dateinamen ein. Falls Sie nur die\n"
+#~ "Eingabetaste betätigen, wird der (in Klammern angezeigte) "
+#~ "Standarddateiname\n"
+#~ "verwendet."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Sie sollten einen Grund für die Zertifizierung angeben. Je nach\n"
+#~ "Zusammenhang können Sie aus dieser Liste auswählen:\n"
+#~ "  \"Schlüssel wurde kompromitiert\"\n"
+#~ "      Falls Sie Grund zu der Annahme haben, daß nicht berechtigte "
+#~ "Personen\n"
+#~ "      Zugriff zu Ihrem geheimen Schlüssel hatten\n"
+#~ "  \"Schlüssel ist überholt\"\n"
+#~ "      Falls Sie diesen Schlüssel durch einem neuen ersetzt haben.\n"
+#~ "  \"Schlüssel wird nicht mehr benutzt\"\n"
+#~ "      Falls Sie diesen Schlüssel zurückgezogen haben.\n"
+#~ "  \"User-ID ist nicht mehr gültig\"\n"
+#~ "      Um bekanntzugeben, daß die User-ID nicht mehr benutzt werden soll.\n"
+#~ "      So weist man normalerweise auf eine ungültige Emailadresse hin.\n"
+
+#~ 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 ""
+#~ "Wenn Sie möchten, können Sie hier einen Text eingeben, der darlegt, "
+#~ "warum\n"
+#~ "Sie diesen Widerruf herausgeben.  Der Text sollte möglichst knapp sein.\n"
+#~ "Eine Leerzeile beendet die Eingabe.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "Notationen können in einen v3- (PGP 2.x-artigen-) Schlüssel nicht "
@@ -8210,17 +8454,6 @@ msgstr "Klasse %s wird nicht unterstützt\n"
 #~ "Eine Policy URL kann in einem v3 Schlüssel(PGP 2.x artig) nicht "
 #~ "gespeichert werden\n"
 
-#, fuzzy
-#~ msgid "shelll"
-#~ msgstr "Schale"
-
-#~ msgid "no running gpg-agent - starting one\n"
-#~ msgstr "Kein aktiver gpg-agent - es wird einer gestarted\n"
-
-#~ msgid "can't connect to the agent - trying fall back\n"
-#~ msgstr ""
-#~ "Verbindung zum gpg-agent nicht möglich - Ersatzmethode wird versucht\n"
-
 #~ msgid "key generation is not available from the commandline\n"
 #~ msgstr "Die Schlüsselerzeugung ist über die Kommandozeile nicht möglich\n"
 
diff --git a/po/el.po b/po/el.po
index ac089138e..52345d738 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -38,51 +38,51 @@ msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "���� MPI"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "���� ����� ������"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "���� ����� ������"
@@ -92,21 +92,21 @@ msgstr "���� ����� ������"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -188,8 +188,8 @@ msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -268,7 +268,7 @@ msgid "Please enter the new passphrase"
 msgstr "������ ��� ������ ������"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -287,13 +287,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "���������"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
@@ -376,8 +376,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
@@ -393,29 +393,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
@@ -527,12 +528,12 @@ msgstr "%s: ������������: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -603,7 +604,7 @@ msgstr "�������"
 msgid "error opening `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
@@ -628,7 +629,7 @@ msgstr "������ ���������: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -855,6 +856,144 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "���� �������������"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "���� �������������"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "������ ��������� ���: "
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: ���������� �������������\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "��������: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"��������������� ����������:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "�� ���������������"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "��������� ��������� ���������\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "�������� ����� ���� %s.\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "���� �������� ��� \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "�� ������� ����������  hash `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "�������� ����� ���� %s.\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "���� �� ������ ���� �����!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "���� �������������"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "���� �������������"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "���� �������������"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "������� ������"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "��� ������� ��������� ������� ��� `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "������ ��� ������ trailer\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -977,14 +1116,14 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
@@ -1163,7 +1302,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
@@ -1280,18 +1419,18 @@ msgstr "�� ������ ������  (��������� \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1335,7 +1474,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -1354,7 +1493,7 @@ msgstr "����� ��� ���������������: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
@@ -1385,7 +1524,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1416,19 +1555,19 @@ msgstr "%s/%s ��������������� ���: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "�������������: �� ������ ��������������� �� ������� ������ ���\n"
 "���������� ��������������.\n"
 
-#: g10/encr-data.c:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "�������� ��� �������� ���������������� �������\n"
 
@@ -1582,7 +1721,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
@@ -1597,7 +1736,7 @@ msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1613,27 +1752,27 @@ msgstr "|[������]|���������� ���� ���������"
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
@@ -1646,11 +1785,11 @@ msgstr "���������� ��� ������ �������� ��� ���������"
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
@@ -1686,11 +1825,11 @@ msgstr "���������� ���� �������������� ���������"
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
@@ -1726,11 +1865,11 @@ msgstr "�������� ��� ����� ��������� ������������"
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1741,32 +1880,32 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
@@ -1782,7 +1921,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1790,7 +1929,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1828,7 +1967,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1848,11 +1987,11 @@ msgstr "���������������: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1860,7 +1999,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
@@ -1934,474 +2073,474 @@ msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2970
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2976
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:2989
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3212
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -2414,7 +2553,7 @@ msgstr "������� ��� �������� ��� ���� �� ����������"
 msgid "make timestamp conflicts only a warning"
 msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
@@ -2430,332 +2569,11 @@ msgstr ""
 "�������: gpg [��������] [������]\n"
 "������� ��������� �� �������� �� ������ ������������ �������\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"����� ������� ��� �� ������� ���� ���. ���� � ���� ��� �� �������\n"
-"���� �� ����� �������.  �� ������������ ��� �������� ��� �����-"
-"������������,\n"
-"��� ���� ������ �� ����� �� ��� (������� �������������) ����-��������������."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"��� �� ������ ���� �����-������������, �� GnuPG ������ �� ����� ���� "
-"�������\n"
-"����� ������ ������������ - ���� ����� ������� ������� ��� ����� �����\n"
-"�������� ��� ������� ������. ��������� \"yes\" (���) ��� �� ����� ��� "
-"������\n"
-"���� ����� �����������\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"��� ������ �� ��������������� ���� �� �� ������������ ������, ��������� \"yes"
-"\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-"�������������� �� user ID ��� �������� ����� ��� ������ �� �������� ������."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"������, ��� ����� ���� ���� �� ��������������� �� ���� ������ ��� ��������\n"
-"��� �������������. ����� � ���������� ������ �� ��������������� ���� ��\n"
-"���������� ������. � �������� ���� ������� �� ������ ��������� ����������."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "�������������� �� ������� ��� ��������"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "��������� \"yes\"(���) � \"no\"(���)"
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"�������������� ��� ����������� ���� ���� ������������.\n"
-"�������� �� �������� ��� ���������� ISO (YYYY-MM-DD) ����\n"
-"��� �� ������ ��� ���� �������� ��������� - �������� �� �������\n"
-"��������� �� ���������� ��� ���� ��� ��������."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "�������������� �� ����� ��� �������������"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "�������������� ����������� ��� ��������� email (����������)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "�������� ����������� �������������� ��� ������"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  ��� ������ ��� ��������.\n"
-"C  ��� ������ ��� �������.\n"
-"E  ��� ������ ��� ���������� email.\n"
-"O  ��� �������� ��� ����������� ��������.\n"
-"Q  ��� �� ����������� �� ���������� ��������."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr ""
-"��������� \"yes\" (� ���� \"y\") ��� ����� ������� �� ������������ �� "
-"���������."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"���� ���������� ��� user ID �� ��� ������, ������ ����� �� ����������� ���\n"
-"�� ������ ������ ��� ������� ��� ��������� ��� user ID. ����� ������� "
-"������� ������, �� ������ ���� ���������� ������ ���� �� �����������.\n"
-"\n"
-"\"0\" �������� ��� ��� �������� ���� ���� ���������� ������������� �� "
-"������.\n"
-"\"1\" �������� ��� ��������� ��� �� ������ ������ ��� ����� ��� ���� ��� "
-"���\n"
-"    ������, ���� ��� �������� � ��� ������������� ������� �� ������. ����\n"
-"    ����� ������� ���� ���������� �� ������ ���� \"����������\" ������.\n"
-"\n"
-"\"2\" �������� ��� ������ ��� ������ ����������� ��� ��������. ��� "
-"����������\n"
-"    ���� ������ �� �������� ��� ������������� �� ������ ��� �������� ��\n"
-"    user ID ��� ������ �� ��� photo ID.\n"
-"\n"
-"\"3\" �������� ��� ������ ���������� ������ ��� ������. ��� ����������, "
-"����\n"
-"    ���� ������ �� �������� ��� �������� �� ��������� ��� �������� �� ���\n"
-"    ��������� ��� �������� \"������\" ����� ��� �������� ��� �� photo ID "
-"���\n"
-"    �������� ����� ����� �� ���� �� ��� ������� �� ������������ ������� �."
-"�.\n"
-"    ���������, ����������, ������� ��������.\n"
-"\n"
-"����� ����� ��� �� ������������ ��� ������� ��� \"�������\" 2 ��� 3 �����\n"
-"*����* ������������. ��� ����� �������� ���� ��� ���� �� ����������� ��\n"
-"�������� \"�������\" ��� �� \"�����������\" �� ���� ���� ���������� "
-"�������.\n"
-"\n"
-"��� ��� ������ ���� ����� � ����� ��������, ����� \"0\"."
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "��������� \"yes\" ��� ������ �� ���������� ��� �� user ID"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"��������� \"yes\" ��� ���������� ������ �� ��������� ����\n"
-"�� user ID.  ��� �� ������������� �� ������ ����!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "��������� \"yes\" ��� ����� ������� �� ��������� �� ���������"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"���� ����� ��� ������ �������� ��� ������. �������� ��� �� ������\n"
-"�� ��������� ���� � �������� ������ ������ �� ����� ���������� ���\n"
-"��������� ��� �������� ������������ ��� ������ � �� ��� ���� ������\n"
-"������������� ��� ����."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"���� � �������� ��� ������ �� �������� ������ ��� ����� �� ����������\n"
-"������.  ������ �� ���������� �� �������� ���, ����� �� ������ ��� ������\n"
-"��������������� ����� ���� �� ������ ��������� ������ �� ����������\n"
-"��� ������� ������������ ���� ���� ����� ��� �������������� ��������."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-"� �������� ��� ����� ������.  ����� ������ �� ��������� ��� ��\n"
-"���������� ���."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"���� ����� ��� �������� ��� ������� �� user ID ��� ������. ���\n"
-"����� ������� ���� ���� �� ��������� ��� ������ ��������.  ����\n"
-"�������������� �� GnuPG ���� �� �� ������ �� �������������� ����\n"
-"�� ������ ���.  ����� �� ���������� ���� ��� ���� � ����-�������� ���\n"
-"������ ���� ��� ����� ������ � ������� ��� �������."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"������� ��� ����������� ���� ��� user ID (� ���� ��� �����������)\n"
-"���� ������������ ����� �����������.  � ���������� ���� ��� ������������\n"
-"����-��������� �� ������� ���� 1 ������������.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "�������� ����������� �� ��������� ����� ������, ��� ��������."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "����� �� ����� ��� ������� ��� ����� ����������� � ��������"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "��������� \"yes\" ��� ����� ������� �� ����������� �� ������"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"�������� �������� ��� ��� ����� �������. ��� ���� �������� RETURN\n"
-"�� ��'������� ������ (������������� ���� �������) �� ��������������."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"������ �� ������� ��� ���� ��� ��� �����������.  ������� �� ��\n"
-"������������, ����� �� ���������� �� ��������� ��� �� �����:\n"
-"  \"�� ������ ���� �������\"\n"
-"      ��������������� ��� ��������� ��� �� ��������������� �������\n"
-"      ����� �������� ��� ������� ������ ���.\n"
-"  \"�� ������ ���� ����������\"\n"
-"      ��������������� ��� ����� �������������� �� ������ �� ��� ����.\n"
-"  \"�� ������ ��� �������������� �����\"\n"
-"      ��������������� ��� ����� �������� ���� �� ������.\n"
-"  \"�� user ID ��� ����� ����� ������\"\n"
-"      ��������������� ���� ��� �� �������� ��� �� user ID ��� ������\n"
-"      �� ��������������� ���. ��� �� ������� ����� ��� ��������� email.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"��� ����������, �������� �� ��������������� ��� ������� ���\n"
-"���������� ��� ���� ��� ��������� ���� �� ������������� ���������.\n"
-"�������� �������� ���� �� ������� ���������. ��� ����� ������\n"
-"����� �� �������.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "��� ������� ��������� �������"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "��� ������� ��������� ������� ��� `%s'"
@@ -2950,13 +2768,13 @@ msgstr "������ %08lX:  ��� ������ - ������������\n"
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
@@ -3046,7 +2864,7 @@ msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
@@ -3540,8 +3358,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
@@ -3550,20 +3368,20 @@ msgstr "� �������� �������: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
@@ -3580,7 +3398,7 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
@@ -3948,93 +3766,93 @@ msgstr "� ��������� �������� �������: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2698
+#: g10/keyedit.c:2699
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2720
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2726
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4042,19 +3860,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4062,7 +3880,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4071,75 +3889,75 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4149,38 +3967,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3426
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3448
+#: g10/keyedit.c:3449
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3474
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -4188,168 +4006,168 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "�������� ���������: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, 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"
@@ -4392,12 +4210,12 @@ msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
@@ -4425,109 +4243,119 @@ msgstr "������������� ���������"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4543,7 +4371,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4559,40 +4387,40 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4600,12 +4428,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4622,44 +4450,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4670,7 +4498,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
@@ -4685,23 +4513,23 @@ msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4709,12 +4537,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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 +4554,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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,50 +4566,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4792,12 +4620,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4805,7 +4633,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4813,28 +4641,28 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
@@ -5140,194 +4968,194 @@ msgstr "��������������� �� ������� ��������� %d\n"
 msgid "public key is %s\n"
 msgstr "������� ������ ����� %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "��������������� �� %s key, ID %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������� �� ������� ������ �������: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "��������������� �� %lu ������� �������\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "��������������� �� 1 ����� ������\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "������� %s ���������������� ���������\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
 "%s ��������\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "���������������� OK\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
@@ -5346,83 +5174,90 @@ msgstr "trustdb: read ������� (n=%d): %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr ""
+"� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
+"����������� ��� ���������\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�� ������������ ���������� ��������������"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = ���������� ������������ �����������\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "����������"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
@@ -6209,13 +6044,13 @@ msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6223,16 +6058,16 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
@@ -6562,7 +6397,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
@@ -6590,33 +6425,33 @@ msgstr "�������� ����� ��� --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "�� �������� ������� ������������ �������\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
@@ -6755,12 +6590,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6821,11 +6656,11 @@ msgstr "keyserver �������� �������: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6937,12 +6772,12 @@ msgstr "%s ��������, ���������� ��������� %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
@@ -6951,7 +6786,7 @@ msgstr "�� �������� ������ OpenPGP ��������.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "�������� �������� ��� `%s'\n"
@@ -7014,22 +6849,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7038,11 +6873,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -7083,8 +6918,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
@@ -7217,61 +7052,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "���������� ���� ���������"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "� ���������� %c%lu ������������\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "������������� ��������� �������������.\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "���� �������������"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7286,7 +7121,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7408,6 +7243,111 @@ msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "� ���������� �������� �������: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (��� �������� ����)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) RSA (��� ������������� ����)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (�������� ��� �������������)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (��� �������� ����)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (��� ������������� ����)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(��� ������ ���������)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "�� ������� ����������  hash `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "��������� Email: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"�������������� �� user ID. ����� �� ��� ����� ������: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "�������������� ��� ��� ����� �������"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7441,195 +7381,195 @@ msgstr "� ���������� %c%lu ������������\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(��� ������ ���������)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "������ ��� ������ ������"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "���������� ascii ������������ ������"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "�� ����� ����������"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "������������ ������ v3 ���������"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "����� ������� MDC ��� �������������"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "��������� batch: �� �� �������� ���������"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "�������� ����� ��� �������� ����������� ��� �����"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�����|����� �������� ��� �������������� ������� ������"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�����|����� ���������� �������������� �����"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�����|����� ���������� ��������� ��������� ����� "
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|����� ���������� ��������� N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7640,36 +7580,36 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�����: gpg [��������] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7776,7 +7716,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7795,31 +7735,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "�������� ����� ���� %s.\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "���� �������� ��� \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                ������ ��� \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -8279,6 +8219,309 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "�����: gpg [��������] [������] (-h ��� �������)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "����� ������� ��� �� ������� ���� ���. ���� � ���� ��� �� �������\n"
+#~ "���� �� ����� �������.  �� ������������ ��� �������� ��� �����-"
+#~ "������������,\n"
+#~ "��� ���� ������ �� ����� �� ��� (������� �������������) ����-"
+#~ "��������������."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "��� �� ������ ���� �����-������������, �� GnuPG ������ �� ����� ���� "
+#~ "�������\n"
+#~ "����� ������ ������������ - ���� ����� ������� ������� ��� ����� �����\n"
+#~ "�������� ��� ������� ������. ��������� \"yes\" (���) ��� �� ����� ��� "
+#~ "������\n"
+#~ "���� ����� �����������\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "��� ������ �� ��������������� ���� �� �� ������������ ������, ��������� "
+#~ "\"yes\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr ""
+#~ "�������������� �� user ID ��� �������� ����� ��� ������ �� �������� "
+#~ "������."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "������, ��� ����� ���� ���� �� ��������������� �� ���� ������ ��� "
+#~ "��������\n"
+#~ "��� �������������. ����� � ���������� ������ �� ��������������� ���� ��\n"
+#~ "���������� ������. � �������� ���� ������� �� ������ ��������� ����������."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "�������������� �� ������� ��� ��������"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "��������� \"yes\"(���) � \"no\"(���)"
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "�������������� ��� ����������� ���� ���� ������������.\n"
+#~ "�������� �� �������� ��� ���������� ISO (YYYY-MM-DD) ����\n"
+#~ "��� �� ������ ��� ���� �������� ��������� - �������� �� �������\n"
+#~ "��������� �� ���������� ��� ���� ��� ��������."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "�������������� �� ����� ��� �������������"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "�������������� ����������� ��� ��������� email (����������)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "�������� ����������� �������������� ��� ������"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  ��� ������ ��� ��������.\n"
+#~ "C  ��� ������ ��� �������.\n"
+#~ "E  ��� ������ ��� ���������� email.\n"
+#~ "O  ��� �������� ��� ����������� ��������.\n"
+#~ "Q  ��� �� ����������� �� ���������� ��������."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr ""
+#~ "��������� \"yes\" (� ���� \"y\") ��� ����� ������� �� ������������ �� "
+#~ "���������."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "���� ���������� ��� user ID �� ��� ������, ������ ����� �� ����������� "
+#~ "���\n"
+#~ "�� ������ ������ ��� ������� ��� ��������� ��� user ID. ����� ������� "
+#~ "������� ������, �� ������ ���� ���������� ������ ���� �� �����������.\n"
+#~ "\n"
+#~ "\"0\" �������� ��� ��� �������� ���� ���� ���������� ������������� �� "
+#~ "������.\n"
+#~ "\"1\" �������� ��� ��������� ��� �� ������ ������ ��� ����� ��� ���� ��� "
+#~ "���\n"
+#~ "    ������, ���� ��� �������� � ��� ������������� ������� �� ������. "
+#~ "����\n"
+#~ "    ����� ������� ���� ���������� �� ������ ���� \"����������\" ������.\n"
+#~ "\n"
+#~ "\"2\" �������� ��� ������ ��� ������ ����������� ��� ��������. ��� "
+#~ "����������\n"
+#~ "    ���� ������ �� �������� ��� ������������� �� ������ ��� �������� ��\n"
+#~ "    user ID ��� ������ �� ��� photo ID.\n"
+#~ "\n"
+#~ "\"3\" �������� ��� ������ ���������� ������ ��� ������. ��� ����������, "
+#~ "����\n"
+#~ "    ���� ������ �� �������� ��� �������� �� ��������� ��� �������� �� "
+#~ "���\n"
+#~ "    ��������� ��� �������� \"������\" ����� ��� �������� ��� �� photo ID "
+#~ "���\n"
+#~ "    �������� ����� ����� �� ���� �� ��� ������� �� ������������ ������� �."
+#~ "�.\n"
+#~ "    ���������, ����������, ������� ��������.\n"
+#~ "\n"
+#~ "����� ����� ��� �� ������������ ��� ������� ��� \"�������\" 2 ��� 3 "
+#~ "�����\n"
+#~ "*����* ������������. ��� ����� �������� ���� ��� ���� �� ����������� ��\n"
+#~ "�������� \"�������\" ��� �� \"�����������\" �� ���� ���� ���������� "
+#~ "�������.\n"
+#~ "\n"
+#~ "��� ��� ������ ���� ����� � ����� ��������, ����� \"0\"."
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "��������� \"yes\" ��� ������ �� ���������� ��� �� user ID"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "��������� \"yes\" ��� ���������� ������ �� ��������� ����\n"
+#~ "�� user ID.  ��� �� ������������� �� ������ ����!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "��������� \"yes\" ��� ����� ������� �� ��������� �� ���������"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "���� ����� ��� ������ �������� ��� ������. �������� ��� �� ������\n"
+#~ "�� ��������� ���� � �������� ������ ������ �� ����� ���������� ���\n"
+#~ "��������� ��� �������� ������������ ��� ������ � �� ��� ���� ������\n"
+#~ "������������� ��� ����."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "���� � �������� ��� ������ �� �������� ������ ��� ����� �� ����������\n"
+#~ "������.  ������ �� ���������� �� �������� ���, ����� �� ������ ��� "
+#~ "������\n"
+#~ "��������������� ����� ���� �� ������ ��������� ������ �� ����������\n"
+#~ "��� ������� ������������ ���� ���� ����� ��� �������������� ��������."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "� �������� ��� ����� ������.  ����� ������ �� ��������� ��� ��\n"
+#~ "���������� ���."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "���� ����� ��� �������� ��� ������� �� user ID ��� ������. ���\n"
+#~ "����� ������� ���� ���� �� ��������� ��� ������ ��������.  ����\n"
+#~ "�������������� �� GnuPG ���� �� �� ������ �� �������������� ����\n"
+#~ "�� ������ ���.  ����� �� ���������� ���� ��� ���� � ����-�������� ���\n"
+#~ "������ ���� ��� ����� ������ � ������� ��� �������."
+
+#~ 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 ""
+#~ "������� ��� ����������� ���� ��� user ID (� ���� ��� �����������)\n"
+#~ "���� ������������ ����� �����������.  � ���������� ���� ��� ������������\n"
+#~ "����-��������� �� ������� ���� 1 ������������.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "�������� ����������� �� ��������� ����� ������, ��� ��������."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "����� �� ����� ��� ������� ��� ����� ����������� � ��������"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "��������� \"yes\" ��� ����� ������� �� ����������� �� ������"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "�������� �������� ��� ��� ����� �������. ��� ���� �������� RETURN\n"
+#~ "�� ��'������� ������ (������������� ���� �������) �� ��������������."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "������ �� ������� ��� ���� ��� ��� �����������.  ������� �� ��\n"
+#~ "������������, ����� �� ���������� �� ��������� ��� �� �����:\n"
+#~ "  \"�� ������ ���� �������\"\n"
+#~ "      ��������������� ��� ��������� ��� �� ��������������� �������\n"
+#~ "      ����� �������� ��� ������� ������ ���.\n"
+#~ "  \"�� ������ ���� ����������\"\n"
+#~ "      ��������������� ��� ����� �������������� �� ������ �� ��� ����.\n"
+#~ "  \"�� ������ ��� �������������� �����\"\n"
+#~ "      ��������������� ��� ����� �������� ���� �� ������.\n"
+#~ "  \"�� user ID ��� ����� ����� ������\"\n"
+#~ "      ��������������� ���� ��� �� �������� ��� �� user ID ��� ������\n"
+#~ "      �� ��������������� ���. ��� �� ������� ����� ��� ��������� email.\n"
+
+#~ 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 ""
+#~ "��� ����������, �������� �� ��������������� ��� ������� ���\n"
+#~ "���������� ��� ���� ��� ��������� ���� �� ������������� ���������.\n"
+#~ "�������� �������� ���� �� ������� ���������. ��� ����� ������\n"
+#~ "����� �� �������.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "�������� ����������� ��������� �������� �� ��������� v3 (PGP 2.x ����)\n"
@@ -8438,9 +8681,6 @@ msgstr "��� ������������� � ���������� ���������� %d%s\n"
 #~ msgid "unknown packet type"
 #~ msgstr "�������� ����� �������"
 
-#~ msgid "unknown version"
-#~ msgstr "������� ������"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "�������� ���������� �������� ��������"
 
@@ -8555,9 +8795,6 @@ msgstr "��� ������������� � ���������� ���������� %d%s\n"
 #~ msgid "network error"
 #~ msgstr "������ �������"
 
-#~ msgid "not encrypted"
-#~ msgstr "�� ���������������"
-
 #~ msgid "not processed"
 #~ msgstr "�� �������������"
 
@@ -8908,9 +9145,6 @@ msgstr "��� ������������� � ���������� ���������� %d%s\n"
 #~ msgid "%08lX: We do NOT trust this key\n"
 #~ msgstr "%08lX: ��� �������������� ���� �� ������\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (�������� ��� �������������)\n"
-
 #, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "   (%d) RSA (��� �������� ����)\n"
diff --git a/po/eo.po b/po/eo.po
index 35340a130..9806bd9e9 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -38,51 +38,51 @@ msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "malbona pasfrazo"
@@ -92,21 +92,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -189,8 +189,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -269,7 +269,7 @@ msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -288,13 +288,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detala eligo"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
@@ -376,8 +376,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
@@ -393,29 +393,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
@@ -527,12 +528,12 @@ msgstr "\t%lu �losiloj ignoritaj\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -603,7 +604,7 @@ msgstr "nuligita de uzanto\n"
 msgid "error opening `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
@@ -628,7 +629,7 @@ msgstr "kiraso: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -856,6 +857,148 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "Valida atestilrevoko"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr ""
+"Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
+"\n"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "Nenia helpo disponata"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: �losilaro kreita\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "kiraso: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Realigitaj metodoj:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "ne �ifrita"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "kontrolo de subskribo estas mal�altita\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Bona subskribo de \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "nevalida kompendi-metodo '%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Valida atestilrevoko"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr ""
+"Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
+"\n"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "Bona atestilo"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "Nevalida atestilo"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "nekonata versio"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Nenia helpo disponata por '%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "eraro en vostolinio\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -980,14 +1123,14 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Via elekto? "
 
@@ -1166,7 +1309,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
@@ -1283,18 +1426,18 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1337,7 +1480,7 @@ msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -1356,7 +1499,7 @@ msgstr "subskribado malsukcesis: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -1381,7 +1524,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1408,18 +1551,18 @@ msgstr "%s/%s-�ifrita por: %s\n"
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "problemo �e traktado de �ifrita paketo\n"
 
@@ -1566,7 +1709,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
@@ -1581,7 +1724,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1597,27 +1740,27 @@ msgstr "|[dosiero]|fari subskribon"
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "listigi �losilojn"
 
@@ -1630,11 +1773,11 @@ msgstr "listigi �losilojn kaj subskribojn"
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
@@ -1670,11 +1813,11 @@ msgstr "krei revokatestilon"
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
@@ -1710,11 +1853,11 @@ msgstr "aktualigi la fido-datenaron"
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1725,32 +1868,32 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
@@ -1766,7 +1909,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1774,7 +1917,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1812,7 +1955,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1832,12 +1975,12 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1845,7 +1988,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
@@ -1916,473 +2059,473 @@ msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 #, 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:3048
+#: g10/gpg.c:3096
 #, 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:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -2397,7 +2540,7 @@ msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
@@ -2412,321 +2555,11 @@ msgid ""
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Vi devas mem doni valoron �i tie; la valoro neniam estos eksportita\n"
-"al alia persono. Ni bezonas �in por realigi la fido-reton; �i neniel\n"
-"rilatas al la (implicite kreita) atestilo-reto."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Por konstrui la fido-reton, GnuPG devas scii, kiuj �losiloj estas\n"
-"absolute fidataj; normale tiuj estas la �losiloj, por kiuj vi havas\n"
-"aliron al la sekreta �losilo. Respondu \"jes\" por igi �i tiun �losilon\n"
-"absolute fidata\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Se vi tamen volas uzi �i tiun nefidatan �losilon, respondu per \"jes\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-"Donu la uzantidentigilon de la adresito, al kiu vi volas sendi la mesa�on."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Donu la �losilgrandon"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Respondu per \"jes\" a� \"ne\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Donu la bezonatan valoron, kiel montrite en la invito.\n"
-"Eblas doni ISO-forman daton (JJJJ-MM-TT), sed vi ne ricevos\n"
-"bonan eraromesa�on; anstata�e la sistemo provas interpreti\n"
-"la donitan valoron kiel gamon."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Donu la nomon de la �losilposedanto"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "bonvolu doni retadreson (ne devige, sed tre rekomendate)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Bonvolu doni nedevigan komenton"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  por �an�i la nomon.\n"
-"K  por �an�i la komenton.\n"
-"A  por �an�i la retadreson.\n"
-"B  por da�rigi kun la �losilkreado.\n"
-"F  por interrompi la �losilkreadon kaj fini."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Respondu per \"jes\" (a� nur \"j\"), se la sub�losilo estu kreita."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Kiam vi subskribas uzantidentigilon sur �losilo, vi devas unue kontroli,\n"
-"ke la �losilo apartenas al la persono nomita en la identigilo. Estas\n"
-"utile por aliaj homoj scii, kiom zorge vi kontrolis tion.\n"
-"\n"
-"\"0\" signifas, ke vi faras nenian specifan aserton pri tio, kiel zorge vi\n"
-"    kontrolis la �losilon.\n"
-"\n"
-"\"1\" signifas, ke vi kredas, ke la �losilo apartenas al la homo, kiu\n"
-"    pretendas posedi �in, sed vi ne povis kontroli, a� simple ne\n"
-"    kontrolis la �losilon. Tio estas utila, kiam oni subskribas la\n"
-"    �losilon de pse�donoma uzanto.\n"
-"\n"
-"\"2\" signifas, ke vi malzorge kontrolis la �losilon. Ekzemple, povas esti,\n"
-"    ke vi kontrolis la fingro�puron de la �losilo kaj komparis la\n"
-"    uzantidentigilon sur la �losilo kun foto-identigilo.\n"
-"\n"
-"\"3\" signifas, ke vi zorge kontrolis la �losilon. Ekzemple, povas esti,\n"
-"    ke vi kontrolis la fingro�puron persone �e la posedanto de la\n"
-"    �losilo, kaj vi kontrolis, per malfacile falsebla dokumento kun\n"
-"    foto-identigilo (ekzemple pasporto), ke la nomo de �losilposedanto\n"
-"    kongruas kun la nomo en la uzantidentigilo sur la �losilo, kaj fine\n"
-"    vi kontrolis (per inter�an�o de retmesa�oj), ke la retadreso sur\n"
-"    la �losilo apartenas al la posedanto de la �losilo.\n"
-"\n"
-"Notu, ke la ekzemploj donitaj supre por la niveloj 2 kaj 3 estas nur\n"
-"ekzemploj. Vi devas fine mem decidi, kion precize signifas \"malzorga\"\n"
-"kaj \"zorga\", kiam vi subskribas aliajn �losilojn.\n"
-"\n"
-"Se vi ne scias la �ustan respondon, respondu per \"0\"."
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Respondu per \"jes\", se vi volas subskribi �iujn uzantidentigilojn"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Respondu per \"jes\", se vi vere volas forvi�i la uzantidentigilon.\n"
-"Tiam anka� �iuj atestiloj perdi�os!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Respondu per \"jes\", se la sub�losilo estu forvi�ita"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"�i tio estas valida �losilsubskribo; normale vi ne volas forvi�i\n"
-"�i tiun subskribon, �ar eble �i estos grava por establi fido-ligon\n"
-"al la �losilo a� al alia �losilo atestita per �i tiu �losilo."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"La subskribo ne estas kontrolebla, �ar vi ne havas la respondan\n"
-"�losilon. Vi devus prokrasti �ian forvi�on, �is vi scios, kiu\n"
-"�losilo estis uzita, �ar la subskribanta �losilo eble establos\n"
-"fido-ligon tra alia jam atestita �losilo."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-"La subskribo ne estas valida. Estas prudente forigi �in de\n"
-"via �losilaro."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"�i tio estas subskribo, kiu ligas la uzantidentigilon al la �losilo.\n"
-"Normale ne estas konsilinde forigi tian subskribon. Efektive, GnuPG\n"
-"eble ne povus uzi la �losilon poste. Do, faru �i tion, nur se la\n"
-"mem-subskribo estas ial nevalida, kaj dua mem-subskribo estas\n"
-"havebla."
-
-#: g10/helptext.c:223
-#, fuzzy
-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 ""
-"�an�i la preferojn de �iuj uzantidentigiloj (a� nur la elektitaj)\n"
-"al la aktuala listo de preferoj. La dato de �iuj trafitaj\n"
-"mem-subskriboj estos anta�enigitaj je unu sekundo.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-"Bonvolu ripeti la pasfrazon, por kontroli, ke vi bone scias, kion vi tajpis."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Donu la nomon de la dosiero, al kiu la subskribo apliki�as"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Respondu per \"jes\", se la dosiero estu surskribita"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Bonvolu doni novan dosiernomon. Se vi premas nur ENEN, la implicita\n"
-"dosiero (montrita en parentezo) estos uzata."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Vi devus doni kialon por �i tiu atestilo. Depende de la kunteksto, vi\n"
-"povas elekti el �i tiu listo:\n"
-"  \"�losilo estas kompromitita\"\n"
-"      Uzu �i tion, se vi pensas, ke nerajtigita homo havis aliron al\n"
-"      via sekreta �losilo.\n"
-"  \"�losilo estas anstata�igita\"\n"
-"      Uzu �i tion, se vi anstata�igis la �losilon per pli nova.\n"
-"  \"�losilo estas ne plu uzata\"\n"
-"      Uzu �i tion, se vi retiris �i tiun �losilon.\n"
-"  \"Uzantidentigilo ne plu validas\"\n"
-"      Uzu �i tion por aserti, ke la uzantidentigilo ne plu estu uzata;\n"
-"      normale oni uzas �i tion por marki retadreson kiel nevalidan.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Se vi volas, vi povas doni tekston por priskribi, kial vi faras\n"
-"�i tiun revokatestilon. Bonvolu fari �i tiun tekston konciza.\n"
-"Malplena linio finas la tekston.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Nenia helpo disponata"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
@@ -2920,13 +2753,13 @@ msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
@@ -3016,7 +2849,7 @@ msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
@@ -3513,8 +3346,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -3523,20 +3356,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
@@ -3553,7 +3386,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
@@ -3921,117 +3754,117 @@ msgstr "aktualigo de sekreto malsukcesis: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4040,75 +3873,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 #, 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:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -4118,201 +3951,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:3366
+#: g10/keyedit.c:3367
 #, 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:3386
+#: g10/keyedit.c:3387
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3426
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3448
+#: g10/keyedit.c:3449
 #, 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:3467
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 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:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, 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:4147
+#: g10/keyedit.c:4148
 #, 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:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 #, 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:4659
+#: g10/keyedit.c:4660
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4356,12 +4189,12 @@ msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
@@ -4389,109 +4222,119 @@ msgstr "�ifri datenojn"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4507,7 +4350,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4523,40 +4366,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4564,12 +4407,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4585,44 +4428,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4633,7 +4476,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 
@@ -4648,23 +4491,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4672,12 +4515,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4689,7 +4532,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4701,50 +4544,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4753,12 +4596,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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4766,7 +4609,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4774,26 +4617,26 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
@@ -5104,196 +4947,196 @@ msgstr "�ifrita per nekonata metodo %d\n"
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -5312,82 +5155,87 @@ msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nerealigita �ifrad-metodo"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
@@ -6158,27 +6006,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:758
+#: g10/sign.c:760
 #, 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:834
+#: g10/sign.c:836
 #, 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:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
@@ -6503,7 +6351,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
@@ -6531,33 +6379,33 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -6696,12 +6544,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6762,11 +6610,11 @@ msgstr "Kreado de �losiloj malsukcesis: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6878,12 +6726,12 @@ msgstr "%s-subskribo de: %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -6892,7 +6740,7 @@ msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "legas opciojn el '%s'\n"
@@ -6955,22 +6803,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6979,11 +6827,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "helpo"
@@ -7024,8 +6872,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@ -7163,68 +7011,68 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "kontroli subskribon"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "ripetita atestilo - forvi�ita"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7239,7 +7087,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7360,6 +7208,113 @@ msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (nur subskribi)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) RSA (nur �ifri)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (subskribi kaj �ifri)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (nur subskribi)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (nur �ifri)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+msgid "No subject name given\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "nevalida kompendi-metodo '%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Retadreso: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Donu la uzantidentigilon. Finu per malplena linio: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Donu novan dosiernomon"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr ""
+"\n"
+"Donu la uzantidentigilon. Finu per malplena linio: "
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "Donu la uzantidentigilon: "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7393,195 +7348,195 @@ msgstr "ripetita atestilo - forvi�ita"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "nevalida respondo de agento\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Valida atestilrevoko"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "krei eligon en askia kiraso"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7592,36 +7547,36 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7728,7 +7683,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7747,31 +7702,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Bona subskribo de \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "            alinome \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
@@ -8228,6 +8183,287 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Vi devas mem doni valoron �i tie; la valoro neniam estos eksportita\n"
+#~ "al alia persono. Ni bezonas �in por realigi la fido-reton; �i neniel\n"
+#~ "rilatas al la (implicite kreita) atestilo-reto."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Por konstrui la fido-reton, GnuPG devas scii, kiuj �losiloj estas\n"
+#~ "absolute fidataj; normale tiuj estas la �losiloj, por kiuj vi havas\n"
+#~ "aliron al la sekreta �losilo. Respondu \"jes\" por igi �i tiun �losilon\n"
+#~ "absolute fidata\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Se vi tamen volas uzi �i tiun nefidatan �losilon, respondu per \"jes\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr ""
+#~ "Donu la uzantidentigilon de la adresito, al kiu vi volas sendi la mesa�on."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Donu la �losilgrandon"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Respondu per \"jes\" a� \"ne\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Donu la bezonatan valoron, kiel montrite en la invito.\n"
+#~ "Eblas doni ISO-forman daton (JJJJ-MM-TT), sed vi ne ricevos\n"
+#~ "bonan eraromesa�on; anstata�e la sistemo provas interpreti\n"
+#~ "la donitan valoron kiel gamon."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Donu la nomon de la �losilposedanto"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "bonvolu doni retadreson (ne devige, sed tre rekomendate)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Bonvolu doni nedevigan komenton"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  por �an�i la nomon.\n"
+#~ "K  por �an�i la komenton.\n"
+#~ "A  por �an�i la retadreson.\n"
+#~ "B  por da�rigi kun la �losilkreado.\n"
+#~ "F  por interrompi la �losilkreadon kaj fini."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Respondu per \"jes\" (a� nur \"j\"), se la sub�losilo estu kreita."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Kiam vi subskribas uzantidentigilon sur �losilo, vi devas unue kontroli,\n"
+#~ "ke la �losilo apartenas al la persono nomita en la identigilo. Estas\n"
+#~ "utile por aliaj homoj scii, kiom zorge vi kontrolis tion.\n"
+#~ "\n"
+#~ "\"0\" signifas, ke vi faras nenian specifan aserton pri tio, kiel zorge "
+#~ "vi\n"
+#~ "    kontrolis la �losilon.\n"
+#~ "\n"
+#~ "\"1\" signifas, ke vi kredas, ke la �losilo apartenas al la homo, kiu\n"
+#~ "    pretendas posedi �in, sed vi ne povis kontroli, a� simple ne\n"
+#~ "    kontrolis la �losilon. Tio estas utila, kiam oni subskribas la\n"
+#~ "    �losilon de pse�donoma uzanto.\n"
+#~ "\n"
+#~ "\"2\" signifas, ke vi malzorge kontrolis la �losilon. Ekzemple, povas "
+#~ "esti,\n"
+#~ "    ke vi kontrolis la fingro�puron de la �losilo kaj komparis la\n"
+#~ "    uzantidentigilon sur la �losilo kun foto-identigilo.\n"
+#~ "\n"
+#~ "\"3\" signifas, ke vi zorge kontrolis la �losilon. Ekzemple, povas esti,\n"
+#~ "    ke vi kontrolis la fingro�puron persone �e la posedanto de la\n"
+#~ "    �losilo, kaj vi kontrolis, per malfacile falsebla dokumento kun\n"
+#~ "    foto-identigilo (ekzemple pasporto), ke la nomo de �losilposedanto\n"
+#~ "    kongruas kun la nomo en la uzantidentigilo sur la �losilo, kaj fine\n"
+#~ "    vi kontrolis (per inter�an�o de retmesa�oj), ke la retadreso sur\n"
+#~ "    la �losilo apartenas al la posedanto de la �losilo.\n"
+#~ "\n"
+#~ "Notu, ke la ekzemploj donitaj supre por la niveloj 2 kaj 3 estas nur\n"
+#~ "ekzemploj. Vi devas fine mem decidi, kion precize signifas \"malzorga\"\n"
+#~ "kaj \"zorga\", kiam vi subskribas aliajn �losilojn.\n"
+#~ "\n"
+#~ "Se vi ne scias la �ustan respondon, respondu per \"0\"."
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Respondu per \"jes\", se vi volas subskribi �iujn uzantidentigilojn"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Respondu per \"jes\", se vi vere volas forvi�i la uzantidentigilon.\n"
+#~ "Tiam anka� �iuj atestiloj perdi�os!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Respondu per \"jes\", se la sub�losilo estu forvi�ita"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "�i tio estas valida �losilsubskribo; normale vi ne volas forvi�i\n"
+#~ "�i tiun subskribon, �ar eble �i estos grava por establi fido-ligon\n"
+#~ "al la �losilo a� al alia �losilo atestita per �i tiu �losilo."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "La subskribo ne estas kontrolebla, �ar vi ne havas la respondan\n"
+#~ "�losilon. Vi devus prokrasti �ian forvi�on, �is vi scios, kiu\n"
+#~ "�losilo estis uzita, �ar la subskribanta �losilo eble establos\n"
+#~ "fido-ligon tra alia jam atestita �losilo."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "La subskribo ne estas valida. Estas prudente forigi �in de\n"
+#~ "via �losilaro."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "�i tio estas subskribo, kiu ligas la uzantidentigilon al la �losilo.\n"
+#~ "Normale ne estas konsilinde forigi tian subskribon. Efektive, GnuPG\n"
+#~ "eble ne povus uzi la �losilon poste. Do, faru �i tion, nur se la\n"
+#~ "mem-subskribo estas ial nevalida, kaj dua mem-subskribo estas\n"
+#~ "havebla."
+
+#, fuzzy
+#~ 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 ""
+#~ "�an�i la preferojn de �iuj uzantidentigiloj (a� nur la elektitaj)\n"
+#~ "al la aktuala listo de preferoj. La dato de �iuj trafitaj\n"
+#~ "mem-subskriboj estos anta�enigitaj je unu sekundo.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr ""
+#~ "Bonvolu ripeti la pasfrazon, por kontroli, ke vi bone scias, kion vi "
+#~ "tajpis."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Donu la nomon de la dosiero, al kiu la subskribo apliki�as"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Respondu per \"jes\", se la dosiero estu surskribita"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Bonvolu doni novan dosiernomon. Se vi premas nur ENEN, la implicita\n"
+#~ "dosiero (montrita en parentezo) estos uzata."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Vi devus doni kialon por �i tiu atestilo. Depende de la kunteksto, vi\n"
+#~ "povas elekti el �i tiu listo:\n"
+#~ "  \"�losilo estas kompromitita\"\n"
+#~ "      Uzu �i tion, se vi pensas, ke nerajtigita homo havis aliron al\n"
+#~ "      via sekreta �losilo.\n"
+#~ "  \"�losilo estas anstata�igita\"\n"
+#~ "      Uzu �i tion, se vi anstata�igis la �losilon per pli nova.\n"
+#~ "  \"�losilo estas ne plu uzata\"\n"
+#~ "      Uzu �i tion, se vi retiris �i tiun �losilon.\n"
+#~ "  \"Uzantidentigilo ne plu validas\"\n"
+#~ "      Uzu �i tion por aserti, ke la uzantidentigilo ne plu estu uzata;\n"
+#~ "      normale oni uzas �i tion por marki retadreson kiel nevalidan.\n"
+
+#~ 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 ""
+#~ "Se vi volas, vi povas doni tekston por priskribi, kial vi faras\n"
+#~ "�i tiun revokatestilon. Bonvolu fari �i tiun tekston konciza.\n"
+#~ "Malplena linio finas la tekston.\n"
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "helpo"
@@ -8332,10 +8568,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 #~ msgstr "Donu la uzantidentigilon: "
 
 #, fuzzy
-#~ msgid "Enter PIN: "
-#~ msgstr "Donu la uzantidentigilon: "
-
-#, fuzzy
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
@@ -8349,9 +8581,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 #~ msgid "unknown packet type"
 #~ msgstr "nekonata paketo-speco"
 
-#~ msgid "unknown version"
-#~ msgstr "nekonata versio"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "nekonata publik�losila metodo"
 
@@ -8469,9 +8698,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 #~ msgid "network error"
 #~ msgstr "reteraro"
 
-#~ msgid "not encrypted"
-#~ msgstr "ne �ifrita"
-
 #~ msgid "not processed"
 #~ msgstr "ne traktita"
 
@@ -8811,9 +9037,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 #~ msgid "%08lX: We do NOT trust this key\n"
 #~ msgstr "%08lX: Ni NE fidas �i tiun �losilon\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (subskribi kaj �ifri)\n"
-
 #, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "   (%d) RSA (nur subskribi)\n"
@@ -9276,9 +9499,6 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 #~ msgid "Invalid certificate revocation"
 #~ msgstr "Nevalida atestilrevoko"
 
-#~ msgid "Invalid certificate"
-#~ msgstr "Nevalida atestilo"
-
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "subskribo-registro %lu[%d] montras al mal�usta registro.\n"
 
diff --git a/po/es.po b/po/es.po
index 9cc0f4870..4b41287ef 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+0100\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -43,41 +43,41 @@ msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 msgid "Quality:"
 msgstr "validez: %s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "l�nea demasiado larga"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase contrase�a demasiado larga\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorrecto"
@@ -91,7 +91,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:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -105,7 +105,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:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "Frase contrase�a incorrecta"
@@ -115,21 +115,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -211,8 +211,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
@@ -291,7 +291,7 @@ msgid "Please enter the new passphrase"
 msgstr "cambia la frase contrase�a"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -310,13 +310,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolijo"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
@@ -398,8 +398,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
@@ -415,29 +415,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
@@ -550,12 +551,12 @@ msgstr "\t%lu claves omitidas\n"
 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:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -635,7 +636,7 @@ msgstr "cancelado"
 msgid "error opening `%s': %s\n"
 msgstr "error en `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fichero de opciones `%s': %s\n"
@@ -660,7 +661,7 @@ msgstr "error de lectura `%s': %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error leyendo `%s': %s\n"
@@ -886,6 +887,149 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr ""
+"No se ha encontrado ning�n certificado sin valor de confianza.\n"
+"\n"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "listar todos los datos disponibles"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: anillo creado\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "validez: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Algoritmos disponibles:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "no cifrado"
+
+#: common/audit.c:740
+#, fuzzy
+msgid "Number of recipients"
+msgstr "Destinatarios actuales:\n"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "suprimida la verificaci�n de la firma\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Firmado el %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Firma correcta de \"%s\""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Firmado el %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr ""
+"No se ha encontrado ning�n certificado sin valor de confianza.\n"
+"\n"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "Certificado correcto"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "Certificado incorrecto"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "Versi�n desconocida"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "No hay ayuda disponible para `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "error en la l�nea de cierre\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1006,13 +1150,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
@@ -1181,7 +1325,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
@@ -1285,18 +1429,18 @@ msgstr "Orden inv�lida (pruebe \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1336,7 +1480,7 @@ msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
@@ -1355,7 +1499,7 @@ msgstr "usando cifrado %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
@@ -1383,7 +1527,7 @@ msgstr ""
 "AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1414,18 +1558,18 @@ msgstr "%s/%s cifrado para: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "problema trabajando con un paquete cifrado\n"
 
@@ -1572,7 +1716,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, 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"
@@ -1591,7 +1735,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1607,27 +1751,27 @@ msgstr "|[file]|crea una firma"
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "lista claves"
 
@@ -1639,11 +1783,11 @@ msgstr "lista claves y firmas"
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
@@ -1679,11 +1823,11 @@ msgstr "genera un certificado de revocaci�n"
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
@@ -1719,11 +1863,11 @@ msgstr "actualiza la base de datos de confianza"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1734,32 +1878,32 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
@@ -1779,7 +1923,7 @@ msgstr "generar mensajes compatibles con PGP 2.x"
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1787,7 +1931,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1825,7 +1969,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1845,11 +1989,11 @@ msgstr "Cifrado: "
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1857,7 +2001,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
@@ -1934,440 +2078,440 @@ 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:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, 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:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, 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:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, 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:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 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:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, 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:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 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:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 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:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2375,19 +2519,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:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -2403,7 +2547,7 @@ msgstr "tomar las claves de este anillo"
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
@@ -2419,335 +2563,11 @@ msgstr ""
 "Sintaxis: gpg [opciones] [ficheros]\n"
 "Confrontar las firmas contra claves conocidas\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Est� en su mano asignar un valor aqu�. Dicho valor nunca ser� exportado a\n"
-"terceros. Es necesario para implementar la red de confianza, no tiene nada\n"
-"que ver con la red de certificados (impl�citamente creada)."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Para construir la Red-de-Confianza, GnuPG necesita saber qu� claves\n"
-"tienen confianza absoluta - normalmente son las claves para las que usted\n"
-"puede acceder a la clave secreta. Conteste \"s�\" para hacer que esta\n"
-"clave se considere como de total confianza\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "Si quiere usar esta clave no fiable de todos modos, conteste \"s�\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Introduzca el ID de usuario al que quiere enviar el mensaje."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"Seleccione el algoritmo que usar.\n"
-"\n"
-"DSA (alias DSS) es el Algoritmo de Firma Digital y s�lo se usa para firmas.\n"
-"\n"
-"Elgamal es un algoritmo s�lo para cifrar.\n"
-"\n"
-"RSA sirve tanto para firmar como para cifrar.\n"
-"\n"
-"La primera clave (clave primaria) debe ser siempre de tipo capaz de firmar."
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"En general no es una buena idea usar la misma clave para firmar y\n"
-"cifrar. Este algoritmo deb�ria usarse solo en ciertos contextos.\n"
-"Por favor consulte primero a un experto en seguridad."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Introduzca la longitud de la clave"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Responda \"s�\" o \"no\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Introduzca el valor requerido conforme se muestra.\n"
-"Es posible introducir una fecha ISO (AAAA-MM-DD), pero no se obtendr� una\n"
-"buena respuesta a los errores; el sistema intentar� interpretar el valor\n"
-"introducido como un intervalo."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Introduzca el nombre del due�o de la clave"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr ""
-"Introduzca una direcci�n de correo electr�nico (opcional pero muy\n"
-"recomendable)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Introduzca un comentario opcional"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  para cambiar el nombre.\n"
-"C  para cambiar el comentario.\n"
-"E  para cambiar la direcci�n.\n"
-"O  para continuar con la generaci�n de clave.\n"
-"S  para interrumpir la generaci�n de clave."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Responda \"s�\" (o s�lo \"s\") para generar la subclave."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Cuando firme un ID de usuario en una clave, deber�a verificar que la clave\n"
-"pertenece a la persona que se nombra en el ID de usuario. Es �til para\n"
-"otros saber c�mo de cuidadosamente lo ha verificado.\n"
-"\n"
-"\"0\" significa que no hace ninguna declaraci�n concreta sobre como ha\n"
-"      comprobado la validez de la clave.\n"
-"\n"
-"\"1\" significa que cree que la clave pertenece a la persona que declara\n"
-"      poseerla pero no pudo o no verific� la clave en absoluto. Esto es "
-"�til\n"
-"      para una verificaci�n en persona cuando firmas la clave de un usuario\n"
-"      pseudoan�nimo.\n"
-"\n"
-"\"2\" significa que hizo una comprobaci�n informal de la clave. Por ejemplo\n"
-"      podr�a querer decir que comprob� la huella dactilar de la clave y\n"
-"      comprob� el ID de usuario en la clave con un ID fotogr�fico.\n"
-"\n"
-"\"3\" significa que hizo una comprobaci�n exhaustiva de la clave. Por\n"
-"      ejemplo verificando la huella dactilar de la clave con el propietario\n"
-"      de la clave, y que comprob�, mediante un documento dif�cil de "
-"falsificar\n"
-"      con ID fotogr�fico (como un pasaporte) que el nombre del poseedor de "
-"la\n"
-"      clave coincide con el ID de usuario en la clave y finalmente que "
-"verific�\n"
-"      (intercambiando email) que la direcci�n de email de la clave "
-"pertenece\n"
-"      al poseedor de la clave.\n"
-"\n"
-"Observe que los ejemplos dados en los niveles 2 y 3 son *solo* ejemplos.\n"
-"En definitiva, usted decide lo que significa \"informal\" y \"exhaustivo\"\n"
-"para usted cuando firma las claves de otros.\n"
-"\n"
-"Si no sabe qu� contestar, conteste \"0\"."
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Responda \"s�\" si quiere firmar TODOS los IDs de usuario"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Responda \"s�\" si realmente quiere borrar este ID de usuario.\n"
-"�Tambi�n se perder�n todos los certificados!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Responda \"s�\" si quiere borrar esta subclave"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Esta es una firma v�lida de esta clave. Normalmente no ser� deseable\n"
-"borrar esta firma ya que puede ser importante para establecer una conexi�n\n"
-"de confianza con la clave o con otra clave certificada por �sta."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Esta firma no puede ser comprobada porque no tiene Vd. la clave\n"
-"correspondiente. Deber�a posponer su borrado hasta conocer qu� clave\n"
-"se us�, ya que dicha clave podr�a establecer una conexi�n de confianza\n"
-"a trav�s de otra clave certificada."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "Esta firma no es v�lida. Tiene sentido borrarla de su anillo."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Esta es una firma que une el ID de usuario a la clave. No suele ser una\n"
-"buena idea borrar dichas firmas. De hecho, GnuPG podr�a no ser capaz de\n"
-"volver a usar esta clave. As� que b�rrela tan s�lo si esta autofirma no\n"
-"es v�lida por alguna raz�n y hay otra disponible."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Cambiar las preferencias de todos los IDs de usuario (o s�lo los \n"
-"seleccionados) a la lista actual de preferencias. El sello de tiempo\n"
-"de todas las autofirmas afectadas se avanzar� en un segundo.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Repita la �ltima frase contrase�a para asegurarse de lo que tecle�."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Introduzca el nombre del fichero al que corresponde la firma"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Responda \"s�\" para sobreescribir el fichero"
-
-# Sugerencia: ENTER -> INTRO.
-# Aceptada.
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Introduzca un nuevo nombre de fichero. Si pulsa INTRO se usar� el fichero\n"
-"por omisi�n (mostrado entre corchetes)."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Deber�a especificar un motivo para la certificaci�n. Dependiendo del\n"
-"contexto puede elegir una opci�n de esta lista:\n"
-"  \"La clave ha sido comprometida\"\n"
-"      Use esto si tiene razones para pensar que personas no autorizadas\n"
-"      tuvieron acceso a su clave secreta.\n"
-"  \"La clave ha sido sustituida\"\n"
-"      Use esto si ha reemplazado la clave por otra m�s nueva.\n"
-"  \"La clave ya no est� en uso\"\n"
-"      Use esto si ha dejado de usar esta clave.\n"
-"  \"La identificaci�n de usuario ya no es v�lida\"\n"
-"      Use esto para se�alar que la identificaci�n de usuario no deber�a\n"
-"      seguir siendo usada; esto se utiliza normalmente para marcar una\n"
-"      direcci�n de correo-e como inv�lida.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Si lo desea puede introducir un texto explicando por qu� emite\n"
-"este certificado de revocaci�n. Por favor, que el texto sea breve.\n"
-"Una l�nea vac�a pone fin al texto.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Ayuda no disponible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
@@ -2945,13 +2765,13 @@ msgstr "clave %s: clave nueva - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
@@ -3040,7 +2860,7 @@ msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
@@ -3498,8 +3318,8 @@ msgstr "He comprobado esta clave meticulosamente.\n"
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -3510,19 +3330,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 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:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
@@ -3539,7 +3359,7 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
@@ -3875,92 +3695,92 @@ msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3968,17 +3788,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:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -3986,7 +3806,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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3995,75 +3815,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "Armadura no v�lida"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4072,191 +3892,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:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, 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:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobreescribir? (s/N) "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, 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:4480
+#: g10/keyedit.c:4481
 #, 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:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 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:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, 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"
@@ -4296,12 +4116,12 @@ msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
@@ -4327,109 +4147,119 @@ msgstr "Cifrado"
 msgid "Authenticate"
 msgstr "Autentificaci�n"
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Conmutar la capacidad de autentificaci�n\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "El par de claves DSA tendr� %u bits.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�De qu� tama�o quiere la clave? (%u) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "los tama�os de claves %s deben estar en el rango %u-%u\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4445,7 +4275,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4461,38 +4291,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4500,11 +4330,11 @@ msgstr ""
 "Su sistema no puede mostrar fechas m�s all� del 2038.\n"
 "Sin embargo funcionar� correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto? (s/n) "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4520,44 +4350,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4568,7 +4398,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor no ponga la direcci�n de correo-e en el nombre real o en el "
@@ -4585,23 +4415,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4609,12 +4439,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4626,7 +4456,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4639,50 +4469,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 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"
@@ -4690,12 +4520,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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4703,7 +4533,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:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4711,25 +4541,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:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, 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:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -5032,192 +4862,192 @@ msgstr "frase contrase�a generada con algoritmo de resumen desconocido %d\n"
 msgid "public key is %s\n"
 msgstr "la clave p�blica es %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contrase�a\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contrase�a\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
@@ -5236,80 +5066,85 @@ msgstr "fstat(%d) fall� en %s: %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVISO: usando un algoritmo de clave p�blica experimental %s\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "AVISO: el algoritmo de resumen %s es una opci�n desaconsejada\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVISO: usando algoritmo de cifrado experimental %s\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVISO: el algoritmo de resumen %s es una opci�n desaconsejada\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, 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:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
@@ -6074,13 +5909,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6088,15 +5923,15 @@ msgstr ""
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
@@ -6416,7 +6251,7 @@ msgstr "absoluta"
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
@@ -6448,28 +6283,28 @@ msgstr "por favor haga un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d dudosa(s) necesarias, %d completa(s) necesarias,\n"
 "modelo de confianza %s\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6477,7 +6312,7 @@ msgstr ""
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, %"
 "du\n"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6618,12 +6453,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
@@ -6684,11 +6519,11 @@ msgstr "la verificaci�n CHV%d fall�: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "el acceso a �rdenes de administrador no est� configurado\n"
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
@@ -6797,12 +6632,12 @@ msgstr "firma %s, algoritmo de resumen %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
@@ -6811,7 +6646,7 @@ msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "leyendo opciones desde `%s'\n"
@@ -6874,22 +6709,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter inv�lido radix64 %02X omitido\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6898,11 +6733,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "ayuda"
@@ -6943,8 +6778,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "fallo al almacenar la clave: %s\n"
@@ -7083,68 +6918,68 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "No se ha encontrado ning�n certificado sin valor de confianza.\n"
 "\n"
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, 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:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una firma"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "certificado duplicado - eliminado"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr ""
 "No se ha encontrado ning�n certificado sin valor de confianza.\n"
 "\n"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7159,7 +6994,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7280,6 +7115,112 @@ msgstr "error escribiendo anillo `%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (s�lo firmar)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (2) Clave de cifrado\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, fuzzy, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "Posibles accriones para una %s clave: "
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (firmar y cifrar)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (s�lo firmar)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (s�lo cifrar)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(No se di� descripci�n)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Direcci�n de correo electr�nico: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Introduzca ID de usuario. Acabe con una l�nea vac�a: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Introduzca nuevo nombre de fichero"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "Introduzca PIN: "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7313,139 +7254,139 @@ 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:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(No se di� descripci�n)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "lista claves secretas"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "register a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea una salida ascii con armadura"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MDC para cifrar"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -7455,60 +7396,60 @@ msgstr "proceso por lotes: nunca preguntar"
 # Adem�s una de las acepciones de asumir es "aceptar algo" y suponer
 # viene a ser asumir una idea como propia. Suponer "s�" en casi todas las
 # preguntas no me acaba de gustar.
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7519,36 +7460,36 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpgm [opciones] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no se puede acceder a `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7655,7 +7596,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7674,31 +7615,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Firmado el %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "error obteniendo el n�mero de serie: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Firma correcta de \"%s\""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \"%s\""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Esto ser� una autofirma.\n"
@@ -8161,6 +8102,331 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "el resumen protector %d no puede ser utilizado\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Est� en su mano asignar un valor aqu�. Dicho valor nunca ser� exportado "
+#~ "a\n"
+#~ "terceros. Es necesario para implementar la red de confianza, no tiene "
+#~ "nada\n"
+#~ "que ver con la red de certificados (impl�citamente creada)."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Para construir la Red-de-Confianza, GnuPG necesita saber qu� claves\n"
+#~ "tienen confianza absoluta - normalmente son las claves para las que "
+#~ "usted\n"
+#~ "puede acceder a la clave secreta. Conteste \"s�\" para hacer que esta\n"
+#~ "clave se considere como de total confianza\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Si quiere usar esta clave no fiable de todos modos, conteste \"s�\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "Introduzca el ID de usuario al que quiere enviar el mensaje."
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "Seleccione el algoritmo que usar.\n"
+#~ "\n"
+#~ "DSA (alias DSS) es el Algoritmo de Firma Digital y s�lo se usa para "
+#~ "firmas.\n"
+#~ "\n"
+#~ "Elgamal es un algoritmo s�lo para cifrar.\n"
+#~ "\n"
+#~ "RSA sirve tanto para firmar como para cifrar.\n"
+#~ "\n"
+#~ "La primera clave (clave primaria) debe ser siempre de tipo capaz de "
+#~ "firmar."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "En general no es una buena idea usar la misma clave para firmar y\n"
+#~ "cifrar. Este algoritmo deb�ria usarse solo en ciertos contextos.\n"
+#~ "Por favor consulte primero a un experto en seguridad."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Introduzca la longitud de la clave"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Responda \"s�\" o \"no\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Introduzca el valor requerido conforme se muestra.\n"
+#~ "Es posible introducir una fecha ISO (AAAA-MM-DD), pero no se obtendr� "
+#~ "una\n"
+#~ "buena respuesta a los errores; el sistema intentar� interpretar el valor\n"
+#~ "introducido como un intervalo."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Introduzca el nombre del due�o de la clave"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr ""
+#~ "Introduzca una direcci�n de correo electr�nico (opcional pero muy\n"
+#~ "recomendable)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Introduzca un comentario opcional"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  para cambiar el nombre.\n"
+#~ "C  para cambiar el comentario.\n"
+#~ "E  para cambiar la direcci�n.\n"
+#~ "O  para continuar con la generaci�n de clave.\n"
+#~ "S  para interrumpir la generaci�n de clave."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Responda \"s�\" (o s�lo \"s\") para generar la subclave."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Cuando firme un ID de usuario en una clave, deber�a verificar que la "
+#~ "clave\n"
+#~ "pertenece a la persona que se nombra en el ID de usuario. Es �til para\n"
+#~ "otros saber c�mo de cuidadosamente lo ha verificado.\n"
+#~ "\n"
+#~ "\"0\" significa que no hace ninguna declaraci�n concreta sobre como ha\n"
+#~ "      comprobado la validez de la clave.\n"
+#~ "\n"
+#~ "\"1\" significa que cree que la clave pertenece a la persona que declara\n"
+#~ "      poseerla pero no pudo o no verific� la clave en absoluto. Esto es "
+#~ "�til\n"
+#~ "      para una verificaci�n en persona cuando firmas la clave de un "
+#~ "usuario\n"
+#~ "      pseudoan�nimo.\n"
+#~ "\n"
+#~ "\"2\" significa que hizo una comprobaci�n informal de la clave. Por "
+#~ "ejemplo\n"
+#~ "      podr�a querer decir que comprob� la huella dactilar de la clave y\n"
+#~ "      comprob� el ID de usuario en la clave con un ID fotogr�fico.\n"
+#~ "\n"
+#~ "\"3\" significa que hizo una comprobaci�n exhaustiva de la clave. Por\n"
+#~ "      ejemplo verificando la huella dactilar de la clave con el "
+#~ "propietario\n"
+#~ "      de la clave, y que comprob�, mediante un documento dif�cil de "
+#~ "falsificar\n"
+#~ "      con ID fotogr�fico (como un pasaporte) que el nombre del poseedor "
+#~ "de la\n"
+#~ "      clave coincide con el ID de usuario en la clave y finalmente que "
+#~ "verific�\n"
+#~ "      (intercambiando email) que la direcci�n de email de la clave "
+#~ "pertenece\n"
+#~ "      al poseedor de la clave.\n"
+#~ "\n"
+#~ "Observe que los ejemplos dados en los niveles 2 y 3 son *solo* ejemplos.\n"
+#~ "En definitiva, usted decide lo que significa \"informal\" y \"exhaustivo"
+#~ "\"\n"
+#~ "para usted cuando firma las claves de otros.\n"
+#~ "\n"
+#~ "Si no sabe qu� contestar, conteste \"0\"."
+
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Responda \"s�\" si quiere firmar TODOS los IDs de usuario"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Responda \"s�\" si realmente quiere borrar este ID de usuario.\n"
+#~ "�Tambi�n se perder�n todos los certificados!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Responda \"s�\" si quiere borrar esta subclave"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Esta es una firma v�lida de esta clave. Normalmente no ser� deseable\n"
+#~ "borrar esta firma ya que puede ser importante para establecer una "
+#~ "conexi�n\n"
+#~ "de confianza con la clave o con otra clave certificada por �sta."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Esta firma no puede ser comprobada porque no tiene Vd. la clave\n"
+#~ "correspondiente. Deber�a posponer su borrado hasta conocer qu� clave\n"
+#~ "se us�, ya que dicha clave podr�a establecer una conexi�n de confianza\n"
+#~ "a trav�s de otra clave certificada."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr "Esta firma no es v�lida. Tiene sentido borrarla de su anillo."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Esta es una firma que une el ID de usuario a la clave. No suele ser una\n"
+#~ "buena idea borrar dichas firmas. De hecho, GnuPG podr�a no ser capaz de\n"
+#~ "volver a usar esta clave. As� que b�rrela tan s�lo si esta autofirma no\n"
+#~ "es v�lida por alguna raz�n y hay otra disponible."
+
+#~ 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 ""
+#~ "Cambiar las preferencias de todos los IDs de usuario (o s�lo los \n"
+#~ "seleccionados) a la lista actual de preferencias. El sello de tiempo\n"
+#~ "de todas las autofirmas afectadas se avanzar� en un segundo.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "Repita la �ltima frase contrase�a para asegurarse de lo que tecle�."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Introduzca el nombre del fichero al que corresponde la firma"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Responda \"s�\" para sobreescribir el fichero"
+
+# Sugerencia: ENTER -> INTRO.
+# Aceptada.
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Introduzca un nuevo nombre de fichero. Si pulsa INTRO se usar� el "
+#~ "fichero\n"
+#~ "por omisi�n (mostrado entre corchetes)."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Deber�a especificar un motivo para la certificaci�n. Dependiendo del\n"
+#~ "contexto puede elegir una opci�n de esta lista:\n"
+#~ "  \"La clave ha sido comprometida\"\n"
+#~ "      Use esto si tiene razones para pensar que personas no autorizadas\n"
+#~ "      tuvieron acceso a su clave secreta.\n"
+#~ "  \"La clave ha sido sustituida\"\n"
+#~ "      Use esto si ha reemplazado la clave por otra m�s nueva.\n"
+#~ "  \"La clave ya no est� en uso\"\n"
+#~ "      Use esto si ha dejado de usar esta clave.\n"
+#~ "  \"La identificaci�n de usuario ya no es v�lida\"\n"
+#~ "      Use esto para se�alar que la identificaci�n de usuario no deber�a\n"
+#~ "      seguir siendo usada; esto se utiliza normalmente para marcar una\n"
+#~ "      direcci�n de correo-e como inv�lida.\n"
+
+#~ 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 ""
+#~ "Si lo desea puede introducir un texto explicando por qu� emite\n"
+#~ "este certificado de revocaci�n. Por favor, que el texto sea breve.\n"
+#~ "Una l�nea vac�a pone fin al texto.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "no uede poner datos de notaci�n en claves v3 (estilo PGP 2.x)\n"
 
@@ -8326,9 +8592,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 #~ msgid "Enter Admin PIN: "
 #~ msgstr "Introduzca PIN de administrador: "
 
-#~ msgid "Enter PIN: "
-#~ msgstr "Introduzca PIN: "
-
 #, fuzzy
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "el agente gpg no esta disponible en esta sesi�n\n"
@@ -8343,9 +8606,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 #~ msgid "unknown packet type"
 #~ msgstr "Formato desconocido"
 
-#~ msgid "unknown version"
-#~ msgstr "Versi�n desconocida"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "Algoritmo de clave p�blica desconocido"
 
@@ -8477,9 +8737,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 #~ msgid "network error"
 #~ msgstr "error de red"
 
-#~ msgid "not encrypted"
-#~ msgstr "no cifrado"
-
 #~ msgid "not processed"
 #~ msgstr "no procesado"
 
@@ -8695,9 +8952,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 #~ msgid "preference %c%lu is not valid\n"
 #~ msgstr "la preferencia %c%lu no es v�lida\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (firmar y cifrar)\n"
-
 #~ msgid ""
 #~ "About to generate a new %s keypair.\n"
 #~ "              minimum keysize is  768 bits\n"
@@ -9257,9 +9511,6 @@ msgstr "el resumen protector %d no puede ser utilizado\n"
 #~ msgid "Invalid certificate revocation"
 #~ msgstr "Certificado de revocaci�n incorrecto"
 
-#~ msgid "Invalid certificate"
-#~ msgstr "Certificado incorrecto"
-
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "registro de firma %lu[%d] apunta al registro equivocado.\n"
 
diff --git a/po/et.po b/po/et.po
index 8ef45704b..4e25f3a3d 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -38,51 +38,51 @@ msgstr "Palun sisestage parool; see on salajane tekst \n"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "halb parool"
@@ -92,21 +92,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -188,8 +188,8 @@ msgstr "parooli ei korratud �ieti; proovige uuesti"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -268,7 +268,7 @@ msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -287,13 +287,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ole jutukas"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
@@ -375,8 +375,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
@@ -392,29 +392,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
@@ -526,12 +527,12 @@ msgstr "%s: j�tsin vahele: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -602,7 +603,7 @@ msgstr "Katkesta"
 msgid "error opening `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
@@ -627,7 +628,7 @@ msgstr "viga lugemisel: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -854,6 +855,144 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "halb sertifikaat"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "halb sertifikaat"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "V�tme leiate: "
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: v�tmehoidla on loodud\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "pakend: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Toetatud algoritmid:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "kr�ptimata"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "allkirja kontroll j�eti �ra\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Allkiri aegus %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Korrektne allkiri kasutajalt \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "vigane r�sialgoritm `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Allkiri aegus %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "See v�ti on aegunud!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "halb sertifikaat"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "halb sertifikaat"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "halb sertifikaat"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "tundmatu versioon"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "`%s' kohta abiinfo puudub"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "viga l�petaval real\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -975,14 +1114,14 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Teie valik? "
 
@@ -1161,7 +1300,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
@@ -1278,18 +1417,18 @@ msgstr "Vigane k�sklus (proovige \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1332,7 +1471,7 @@ msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -1351,7 +1490,7 @@ msgstr "kasutan �iffrit %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
@@ -1378,7 +1517,7 @@ msgid ""
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1407,17 +1546,17 @@ msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "probleem kr�ptitud paketi k�sitlemisel\n"
 
@@ -1573,7 +1712,7 @@ msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
@@ -1588,7 +1727,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1604,27 +1743,27 @@ msgstr "|[fail]|loo allkiri"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
@@ -1637,11 +1776,11 @@ msgstr "n�ita v�tmeid ja allkirju"
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
@@ -1677,11 +1816,11 @@ msgstr "genereeri t�histamise sertifikaat"
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
@@ -1717,11 +1856,11 @@ msgstr "uuenda usalduse andmebaasi"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1732,32 +1871,32 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
@@ -1773,7 +1912,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1781,7 +1920,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1819,7 +1958,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1839,11 +1978,11 @@ msgstr "�iffer: "
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1851,7 +1990,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
@@ -1922,466 +2061,466 @@ msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -2394,7 +2533,7 @@ msgstr "v�ta v�tmed sellest v�tmehoidlast"
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
@@ -2410,320 +2549,11 @@ msgstr ""
 "S�ntaks: gpg [v�tmed] [failid]\n"
 "kontrolli allkirju tuntud usaldusv��rsete v�tmetega\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Teie �lesanne on sisestada n��d v��rtus; seda v��rtust ei avalikustata\n"
-"kolmandatele pooltele. Seda v��rtust on vaja et realiseerida usaldusv�rk."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Usalduse v�rgu loomiseks peab GnuPG teadma, millised v�tmed on\n"
-"absoluutselt usaldatavad. Need on tavaliselt v�tmed, mille puhul\n"
-"on teil juurdep��s ka nende salajastele v�tmetele. Kui soovite\n"
-"m��rata seda v�tit absoluutselt usaldatavaks, vastake \"jah\"\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Kui te ikkagi soovite kasutada seda mitteusaldatavat v�tit, vastake \"jah\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Sisestage kasutaja ID aadressile, kellele te soovite teadet saata."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"�ldiselt ei ole hea m�te kasutada sama v�tit allkirjastamiseks ja\n"
-"kr�pteerimiseks. Seda algoritmi tuleks kasutada ainult teatud piirides.\n"
-"Enne kasutamist konsulteerige palun oma turva eksperdiga."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Sisestage v�tmepikkus"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Vastake \"jah\" v�i \"ei\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Sisestage n�utav v��rtus, nagu viibal n�idati.\n"
-"V�imalik on ka sisestada ISO kuup�ev (AAAA-KK-PP), aga te ei\n"
-"saa korrektset veateadet, kuna s�steem �ritab antud v��rtust\n"
-"t�lgendada vahemikuna."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Sisestage v�tmehoidja nimi"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "palun e-posti aadress, aadress ei ole kohustuslik, aga v�ga soovitav"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Te v�ite n��d sisestada kommentaari"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  et muuta nime.\n"
-"K  et muuta kommentaari.\n"
-"E  et muuta e-posti aadressi.\n"
-"O  et j�tkata v�tme loomist.\n"
-"V  et l�petada v�tme loomine."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Vastake \"jah\" (v�i \"j\"), kui v�ib alustada alamv�tme loomisega."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Kui te allkirjastate v�tme kasutaja ID, kontrollige k�igepealt, kas v�ti\n"
-"ikka kuulub antud ID-ga n�idatud isikule. Teistel inimestel on hea teada,\n"
-"kui hoolikalt te seda kontrolli olete teostanud.\n"
-"\n"
-"\"0\" t�hendab, et te ei v�ida oma kontrollimise kohta midagi.\n"
-"\n"
-"\"1\" t�hendab, et te usute, et v�tit omab isik, kes seda v�idab omavat, "
-"kuid\n"
-"    te ei saanud v�i ei soovinud seda v�idet t�iendavalt kontrollida. See\n"
-"    on kasulik \"persooni\" kontrolliks, kui te allkirjastate isiku pseudo-\n"
-"    n��mi v�tit.\n"
-"\n"
-"\"2\" t�hendab, et te teostasite v�tme pealiskaudset kontrolli. See v�ib\n"
-"    n�iteks t�hendada, et te kontrollisite v�tme s�rmej�lge ja "
-"kontrollisite\n"
-"    v�tme kasutaja ID foto ID vastu.\n"
-"\n"
-"\"3\" t�hendab, et te teostasite v�tme p�hjalikku kontrolli. See v�ib "
-"n�iteks\n"
-"    t�hendada, et v�rdlesite v�tme s�rmej�lge v�rme omanikuga otse suheldes\n"
-"    ja et te kontrollisite raskesti v�ltsitavast allikast (nt. pass) et\n"
-"    v�tme omaniku nimi vastab v�tmel n�idatud kasutaja IDle ja te kontrol-\n"
-"    lisite, et v�tmel n�idatud e-posti aadress kuulub v�tme omanikule.\n"
-"\n"
-"pange t�hele, et n�ited tasemete 2 ja 3 juures on *ainult* n�ited. S�ltub\n"
-"ainult teist, milline on \"pealiskaudse\" ja \"p�hjaliku\" kontrolli "
-"t�hendus,\n"
-"kui te allkirjastate teisi v�tmeid.\n"
-"\n"
-"Kui te ei tea �iget vastust, vastake \"0\"."
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Kui te soovite allkirjastada K�IK kasutaja IDd, vastake \"jah\""
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Kui te t�esti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
-"Sertifikaadid kustutatakse samuti!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Kui selle alamv�tme v�ib kustutada, vastake \"jah\""
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"See on v�tme kehtiv allkiri; tavaliselt seda ei soovita kustutada,\n"
-"kuna see allkiri v�ib olla vajalik, et kirjeldada antud v�tme v�i\n"
-"antud v�tmega sertifitseeritud teise v�tme usaldatavust."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Seda allkirja ei saa kontrollida, kuna puudub allkirjale vastav v�ti.\n"
-"Te peaksite peatama kustutamise, kuni on teada, millist v�tit see\n"
-"kasutab, sest see v�ti v�ib moodustada usaldussuhte l�bi m�ne juba\n"
-"sertifitseeritud v�tme."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "Allkiri ei ole kehtiv. Oleks m�istlik see v�tmehoidlast kustutada."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"See allkiri seob kasutaja ID v�tmega. Sellist allkirja ei ole\n"
-"�ldiselt soovitatav eemaldada. Peale selle kustutamist ei pruugi\n"
-"GnuPG enam olla v�imeline seda v�tit leidma. Kustutada v�iks\n"
-"vaid siis, kui see allkiri ei ole miskip�rast kehtiv ja on\n"
-"olemas ka teine allkiri, mis kasutajat v�tmega seob."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Muuda k�ikide kasutaja ID-de seaded (v�i ainult valitud)\n"
-"vastavaks hetkel m��ratud seadetele. K�ikide asjasse puutuvate\n"
-"ise loodud allkirjade ajatempleid suurendatakse �he sekundi v�rra.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Palun sisestage parool; see on salajane tekst \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Palun korrake parooli, siis saate oma kirjutatus kindel olla."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Sisestage palun failinimi, mida allkirjastada"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Vastake \"jah\", kui faili v�ib �le kirjutada"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
-"kasutatakse vaikimisi faili (nimi on nurksulgudes)."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Te peate m��rama sertifitseerimise p�hjuse. S�ltuvalt kontekstist on\n"
-"teil v�imalus valida �ks j�rgnevaist:\n"
-"  \"V�ti on kompromiteeritud\"\n"
-"      Kasutage seda, kui teil on p�hjust uskuda, et autoriseerimata\n"
-"      isikud on saanud juurdep��su teie salajasele v�tmele.\n"
-"  \"V�ti on asendatud\"\n"
-"      Kasutage seda, kui te olete selle v�tme asendanud uuemaga.\n"
-"  \"V�ti ei ole enam kasutusel\"\n"
-"      Kasutage seda, kui te ei kasuta enam seda v�tit.\n"
-"  \"Kasutaja ID ei ole enam kehtiv\"\n"
-"      Kasutage seda m�rkimaks, et konkreetset kasutaja ID ei peaks enam\n"
-"      kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
-"aadressi.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Kui te soovite, v�ite n��d sisestada p�hjenduse, miks te\n"
-"soovite seda t�histamise sertifikaati esitada. Palun kirjutage\n"
-"l�hidalt. T�hi rida l�petab teksti.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Abiinfo puudub"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
@@ -2919,13 +2749,13 @@ msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
@@ -3015,7 +2845,7 @@ msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
@@ -3498,8 +3328,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
@@ -3508,20 +3338,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
@@ -3538,7 +3368,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
@@ -3904,93 +3734,93 @@ msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3998,19 +3828,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:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4018,7 +3848,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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4027,75 +3857,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 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:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4104,197 +3934,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:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 #, 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:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, 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:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 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:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, 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"
@@ -4337,12 +4167,12 @@ msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
@@ -4370,109 +4200,119 @@ msgstr "kr�pteeri andmed"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4488,7 +4328,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4504,40 +4344,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4545,12 +4385,12 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4566,44 +4406,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4614,7 +4454,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 
@@ -4629,23 +4469,23 @@ msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4653,12 +4493,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4670,7 +4510,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4682,50 +4522,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4735,43 +4575,43 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, 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:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, 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:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
@@ -5076,191 +4916,191 @@ msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 msgid "public key is %s\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kr�pteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "kr�pteeritud �he parooliga\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "V�tme leiate: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -5279,82 +5119,88 @@ msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr ""
+"s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "realiseerimata �ifri algoritm"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = esita palun t�iendavat infot\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
@@ -6125,28 +5971,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, 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:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
@@ -6473,7 +6319,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
@@ -6501,32 +6347,32 @@ msgstr "palun tehke --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
@@ -6665,12 +6511,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6731,11 +6577,11 @@ msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6847,12 +6693,12 @@ msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -6861,7 +6707,7 @@ msgstr "ei leia OpenPGP andmeid.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "loen v�tmeid failist `%s'\n"
@@ -6924,22 +6770,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6948,11 +6794,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -6993,8 +6839,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
@@ -7127,61 +6973,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "kontrolli allkirja"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "T�histamise sertifikaat on loodud.\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7196,7 +7042,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7317,6 +7163,111 @@ msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(Kirjeldust ei antud)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "vigane r�sialgoritm `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "E-posti aadress: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Sisestage kasutaja ID.  L�petage t�hja reaga: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Sisestage uus failinimi"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7350,195 +7301,195 @@ 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:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "�ra kasuta terminali"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "kr�ptimisel kasuta alati MDC"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "pakettmood: �ra k�si kunagi"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "eelda enamus k�simustele jah vastust"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "eelda enamus k�simustele ei vastust"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7549,36 +7500,36 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7685,7 +7636,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7704,31 +7655,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Allkiri aegus %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                 ka \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -8188,6 +8139,297 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Teie �lesanne on sisestada n��d v��rtus; seda v��rtust ei avalikustata\n"
+#~ "kolmandatele pooltele. Seda v��rtust on vaja et realiseerida usaldusv�rk."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Usalduse v�rgu loomiseks peab GnuPG teadma, millised v�tmed on\n"
+#~ "absoluutselt usaldatavad. Need on tavaliselt v�tmed, mille puhul\n"
+#~ "on teil juurdep��s ka nende salajastele v�tmetele. Kui soovite\n"
+#~ "m��rata seda v�tit absoluutselt usaldatavaks, vastake \"jah\"\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Kui te ikkagi soovite kasutada seda mitteusaldatavat v�tit, vastake \"jah"
+#~ "\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "Sisestage kasutaja ID aadressile, kellele te soovite teadet saata."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "�ldiselt ei ole hea m�te kasutada sama v�tit allkirjastamiseks ja\n"
+#~ "kr�pteerimiseks. Seda algoritmi tuleks kasutada ainult teatud piirides.\n"
+#~ "Enne kasutamist konsulteerige palun oma turva eksperdiga."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Sisestage v�tmepikkus"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Vastake \"jah\" v�i \"ei\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Sisestage n�utav v��rtus, nagu viibal n�idati.\n"
+#~ "V�imalik on ka sisestada ISO kuup�ev (AAAA-KK-PP), aga te ei\n"
+#~ "saa korrektset veateadet, kuna s�steem �ritab antud v��rtust\n"
+#~ "t�lgendada vahemikuna."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Sisestage v�tmehoidja nimi"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr ""
+#~ "palun e-posti aadress, aadress ei ole kohustuslik, aga v�ga soovitav"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Te v�ite n��d sisestada kommentaari"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  et muuta nime.\n"
+#~ "K  et muuta kommentaari.\n"
+#~ "E  et muuta e-posti aadressi.\n"
+#~ "O  et j�tkata v�tme loomist.\n"
+#~ "V  et l�petada v�tme loomine."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Vastake \"jah\" (v�i \"j\"), kui v�ib alustada alamv�tme loomisega."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Kui te allkirjastate v�tme kasutaja ID, kontrollige k�igepealt, kas v�ti\n"
+#~ "ikka kuulub antud ID-ga n�idatud isikule. Teistel inimestel on hea "
+#~ "teada,\n"
+#~ "kui hoolikalt te seda kontrolli olete teostanud.\n"
+#~ "\n"
+#~ "\"0\" t�hendab, et te ei v�ida oma kontrollimise kohta midagi.\n"
+#~ "\n"
+#~ "\"1\" t�hendab, et te usute, et v�tit omab isik, kes seda v�idab omavat, "
+#~ "kuid\n"
+#~ "    te ei saanud v�i ei soovinud seda v�idet t�iendavalt kontrollida. "
+#~ "See\n"
+#~ "    on kasulik \"persooni\" kontrolliks, kui te allkirjastate isiku "
+#~ "pseudo-\n"
+#~ "    n��mi v�tit.\n"
+#~ "\n"
+#~ "\"2\" t�hendab, et te teostasite v�tme pealiskaudset kontrolli. See v�ib\n"
+#~ "    n�iteks t�hendada, et te kontrollisite v�tme s�rmej�lge ja "
+#~ "kontrollisite\n"
+#~ "    v�tme kasutaja ID foto ID vastu.\n"
+#~ "\n"
+#~ "\"3\" t�hendab, et te teostasite v�tme p�hjalikku kontrolli. See v�ib "
+#~ "n�iteks\n"
+#~ "    t�hendada, et v�rdlesite v�tme s�rmej�lge v�rme omanikuga otse "
+#~ "suheldes\n"
+#~ "    ja et te kontrollisite raskesti v�ltsitavast allikast (nt. pass) et\n"
+#~ "    v�tme omaniku nimi vastab v�tmel n�idatud kasutaja IDle ja te "
+#~ "kontrol-\n"
+#~ "    lisite, et v�tmel n�idatud e-posti aadress kuulub v�tme omanikule.\n"
+#~ "\n"
+#~ "pange t�hele, et n�ited tasemete 2 ja 3 juures on *ainult* n�ited. "
+#~ "S�ltub\n"
+#~ "ainult teist, milline on \"pealiskaudse\" ja \"p�hjaliku\" kontrolli "
+#~ "t�hendus,\n"
+#~ "kui te allkirjastate teisi v�tmeid.\n"
+#~ "\n"
+#~ "Kui te ei tea �iget vastust, vastake \"0\"."
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Kui te soovite allkirjastada K�IK kasutaja IDd, vastake \"jah\""
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Kui te t�esti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
+#~ "Sertifikaadid kustutatakse samuti!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Kui selle alamv�tme v�ib kustutada, vastake \"jah\""
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "See on v�tme kehtiv allkiri; tavaliselt seda ei soovita kustutada,\n"
+#~ "kuna see allkiri v�ib olla vajalik, et kirjeldada antud v�tme v�i\n"
+#~ "antud v�tmega sertifitseeritud teise v�tme usaldatavust."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Seda allkirja ei saa kontrollida, kuna puudub allkirjale vastav v�ti.\n"
+#~ "Te peaksite peatama kustutamise, kuni on teada, millist v�tit see\n"
+#~ "kasutab, sest see v�ti v�ib moodustada usaldussuhte l�bi m�ne juba\n"
+#~ "sertifitseeritud v�tme."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr "Allkiri ei ole kehtiv. Oleks m�istlik see v�tmehoidlast kustutada."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "See allkiri seob kasutaja ID v�tmega. Sellist allkirja ei ole\n"
+#~ "�ldiselt soovitatav eemaldada. Peale selle kustutamist ei pruugi\n"
+#~ "GnuPG enam olla v�imeline seda v�tit leidma. Kustutada v�iks\n"
+#~ "vaid siis, kui see allkiri ei ole miskip�rast kehtiv ja on\n"
+#~ "olemas ka teine allkiri, mis kasutajat v�tmega seob."
+
+#~ 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 ""
+#~ "Muuda k�ikide kasutaja ID-de seaded (v�i ainult valitud)\n"
+#~ "vastavaks hetkel m��ratud seadetele. K�ikide asjasse puutuvate\n"
+#~ "ise loodud allkirjade ajatempleid suurendatakse �he sekundi v�rra.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Palun sisestage parool; see on salajane tekst \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "Palun korrake parooli, siis saate oma kirjutatus kindel olla."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Sisestage palun failinimi, mida allkirjastada"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Vastake \"jah\", kui faili v�ib �le kirjutada"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
+#~ "kasutatakse vaikimisi faili (nimi on nurksulgudes)."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Te peate m��rama sertifitseerimise p�hjuse. S�ltuvalt kontekstist on\n"
+#~ "teil v�imalus valida �ks j�rgnevaist:\n"
+#~ "  \"V�ti on kompromiteeritud\"\n"
+#~ "      Kasutage seda, kui teil on p�hjust uskuda, et autoriseerimata\n"
+#~ "      isikud on saanud juurdep��su teie salajasele v�tmele.\n"
+#~ "  \"V�ti on asendatud\"\n"
+#~ "      Kasutage seda, kui te olete selle v�tme asendanud uuemaga.\n"
+#~ "  \"V�ti ei ole enam kasutusel\"\n"
+#~ "      Kasutage seda, kui te ei kasuta enam seda v�tit.\n"
+#~ "  \"Kasutaja ID ei ole enam kehtiv\"\n"
+#~ "      Kasutage seda m�rkimaks, et konkreetset kasutaja ID ei peaks enam\n"
+#~ "      kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
+#~ "aadressi.\n"
+
+#~ 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 ""
+#~ "Kui te soovite, v�ite n��d sisestada p�hjenduse, miks te\n"
+#~ "soovite seda t�histamise sertifikaati esitada. Palun kirjutage\n"
+#~ "l�hidalt. T�hi rida l�petab teksti.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n"
 
@@ -8339,9 +8581,6 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 #~ msgid "unknown packet type"
 #~ msgstr "tundmatu paketi t��p"
 
-#~ msgid "unknown version"
-#~ msgstr "tundmatu versioon"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "tundmatu avaliku v�tme algoritm"
 
@@ -8456,9 +8695,6 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 #~ msgid "network error"
 #~ msgstr "v�rgu viga"
 
-#~ msgid "not encrypted"
-#~ msgstr "kr�ptimata"
-
 #~ msgid "not processed"
 #~ msgstr "ei t��deldud"
 
@@ -8798,9 +9034,6 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 #~ msgid "%08lX: We do NOT trust this key\n"
 #~ msgstr "%08lX: Me EI usalda seda v�tit\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
-
 #, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
diff --git a/po/fi.po b/po/fi.po
index 9b31f0110..0e0c3582b 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -54,51 +54,51 @@ msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "väärä salasana"
@@ -108,21 +108,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -204,8 +204,8 @@ msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -284,7 +284,7 @@ msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -303,13 +303,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "monisanainen"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
@@ -391,8 +391,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -409,29 +409,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
@@ -543,12 +544,12 @@ msgstr "%s: ohitettu: %s\n"
 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:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -619,7 +620,7 @@ msgstr "Peru"
 msgid "error opening `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
@@ -644,7 +645,7 @@ msgstr "lukuvirhe: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -871,6 +872,144 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "virheellinen varmenne"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "virheellinen varmenne"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "Avain saatavilla kohteessa: "
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: avainrengas luotu\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "ascii-koodaus: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Tuetut algoritmit:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "salaamaton"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "allekirjoituksen varmistus vaiennetaan\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Allekirjoitus vanheni %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Allekirjoitus täsmää lähettäjään \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Allekirjoitus vanheni %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Tämä avain on vanhentunut!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "virheellinen varmenne"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "virheellinen varmenne"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "virheellinen varmenne"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "tuntematon versio"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Ei ohjetta aiheesta \"%s\""
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "virhe trailer-rivissä\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -994,14 +1133,14 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Valintasi? "
 
@@ -1180,7 +1319,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
@@ -1297,18 +1436,18 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1351,7 +1490,7 @@ msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -1370,7 +1509,7 @@ msgstr "käytetään salakirjoitusalgoritmia %s\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
@@ -1396,7 +1535,7 @@ 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:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1423,19 +1562,19 @@ msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "ongelma käsiteltäessä salattua pakettia\n"
 
@@ -1589,7 +1728,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
@@ -1607,7 +1746,7 @@ msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1623,27 +1762,27 @@ msgstr "|[tiedosto]|tee allekirjoitus"
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "näytä avaimet"
 
@@ -1656,11 +1795,11 @@ msgstr "näytä avaimet allekirjoituksineen"
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
@@ -1696,11 +1835,11 @@ msgstr "luo mitätöintivarmenne"
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
@@ -1736,11 +1875,11 @@ msgstr "päivitä luottamustietokanta"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1751,32 +1890,32 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
@@ -1792,7 +1931,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1801,7 +1940,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1839,7 +1978,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1859,11 +1998,11 @@ msgstr "Salaus: "
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1871,7 +2010,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
@@ -1942,467 +2081,467 @@ msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 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:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -2415,7 +2554,7 @@ msgstr "ota avaimet tästä avainrenkaasta"
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
@@ -2431,328 +2570,11 @@ msgstr ""
 "Käyttö: gpg [valitsimet] [tiedostot]\n"
 "Tarkista allekirjoituksia tunnetuille luotetuille avaimille\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Tämän arvon määrittäminen on sinun tehtäväsi, tätä arvoa ei koskaan \n"
-"kerrota kolmansille osapuolille. Tarvitsemme sitä toteuttamaan \n"
-"luottamusverkko eikä sillä ei ole mitään tekemistä (epäsuorasti luotujen) \n"
-"varmenneverkkojen kanssa."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Rakentaakseen luottamusverkon, GnuPG:n täytyy tietää mihin avaimiin \n"
-"luotetaan ehdottomasti - nämä ovat tavallisesti ne avaimet, joiden "
-"salainen \n"
-"pari on sinulla.  Vastaa \"kyllä\" luottaaksesi tähän avaimeen ehdoitta\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Vastaa \"kyllä\" jos haluat kaikesta huolimatta käyttää tätä epäluotettavaa\n"
-"avainta."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Syötä vastaanottajan, jolle haluat lähettää viestin, käyttäjätunnus."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"Yleensä ei ole järkevää käyttää samaa avainta allekirjoitukseen\n"
-"ja salaamiseen. Tätä algorimiä tulisi käyttää vain määrätyissä "
-"ympäristöissä.\n"
-"Ole hyvä ja kysy tietoturva-asiantuntijaltasi ensin"
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Syötä avaimen koko"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Vastaa \"kyllä\" tai \" ei\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Syötä pyydetty arvo kuten näkyy kehotteessa.\n"
-"On mahdollista syöttää ISO-muotoinen päivä (VVVV-KK-PP),\n"
-"mutta sen seurauksena et saa kunnollista virheilmoitusta \n"
-"vaan järjestelmä yrittää tulkita arvon aikajaksona."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Anna avaimen haltijan nimi"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "anna vapaaehtoinen, mutta erittäin suositeltava sähköpostiosoite"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Kirjoita vapaaehtoinen huomautus"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N   muuta nimeä\n"
-"C   muuta kommenttia\n"
-"E   muuta sähköpostiosoitetta\n"
-"O   jatka avaimen luomista\n"
-"L   lopeta"
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Vastaa \"kyllä\" (tai vain \"k\") jos haluat luoda aliavaimen."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Allekirjoittaessasi avaimen käyttäjätunnuksen sinun tulisi varmista, että \n"
-"avain todella kuuluu henkilölle, joka mainitaan käyttäjätunnuksessa.  "
-"Muiden \n"
-"on hyvä tietää kuinka huolellisesti olet varmistanut tämän. \n"
-"\n"
-"\"0\" tarkoittaa, että et väitä mitään siitä, kuinka huolellisesti olet\n"
-"    varmistanut avaimen.\n"
-"\n"
-"\"1\" tarkoittaa, että uskot avaimen kuuluvan henkilölle, joka väittää \n"
-"    hallitsevan sitä, mutta et voinut varmistaa tai et varmistanut avainta \n"
-"    lainkaan.  Tämä on hyödyllinen \"persoonan\" varmistamiseen, jossa \n"
-"    allekirjoitat pseudonyymin käyttäjän avaimen.\n"
-"\n"
-"\"2\" tarkoittaa arkista varmistusta.  Esimerkiksi olet varmistanut \n"
-"    avaimen sormenjäljen ja tarkistanut käyttäjätunnuksen ja \n"
-"    valokuvatunnisteen täsmäävän.\n"
-"\n"
-"\"3\" tarkoittaa syvällistä henkilöllisyyden varmistamista.  Esimerkiksi \n"
-"    tämä voi tarkoittaa avaimen sormenjäljen tarkistamista avaimen "
-"haltijan \n"
-"    kanssa henkilökohtaisesti, ja että tarkistit nimen avaimessa täsmäävän \n"
-"    vaikeasti väärennettävän kuvallisen henkilöllisyystodistuksen (kuten \n"
-"    passi) kanssa, ja lopuksi varmistit (sähköpostin vaihtamisella), että \n"
-"    sähköpostiosoite kuuluu avaimen haltijalle.\n"
-"\n"
-"Huomaa, että yllä annetut esimerkit tasoille 2 ja 3 ovat todellakin *vain* \n"
-"esimerkkejä.  Lopullisesti se on sinun päätöksesi mitä \"arkinen\" ja \n"
-"\"syvällinen\" tarkoittaa allekirjoittaessasi muita avaimia.\n"
-"\n"
-"Jos et tiedä mikä olisi sopiva vastaus, vastaa \"0\"."
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Vastaa \"kyllä\" jos haluat allekirjoittaa KAIKKI käyttäjätunnukset"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Vastaa \"kyllä\", jos haluat poistaa tämän käyttäjätunnuksen.\n"
-"Menetät samalla kaikki siihen liittyvät varmenteet!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Vastaa \"kyllä\", jos aliavaimen voi poistaa"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Tämä on voimassa oleva allekirjoitus tälle avaimelle, tavallisesti ei \n"
-"kannata poistaa tätä allekirjoitusta koska se saattaa olla tarpeen\n"
-"luottamussuhteen luomiseksi avaimeen tai johonkin toiseen tämän avaimen\n"
-"varmentamaan avaimeen."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Allekirjoitusta ei voida tarkistaa koska sinulla ei ole \n"
-"siihen liittyvää avainta. Lykkää sen poistamista kunnes\n"
-" tiedät mitä avainta on käytetty, koska allekirjoitus \n"
-"avain saattaa luoda luottamusketjun toisen, jo ennalta \n"
-"varmennetun avaimen kautta."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-"Allekirjoitus ei ole pätevä.  Järkevintä olisi poistaa se \n"
-"avainrenkaastasi."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Tämä allekirjoitus takaa avaimen haltijan henkilöllisyyden. \n"
-"Tällaisen allekirjoituksen poistaminen on tavallisesti huono \n"
-"ajatus.  GnuPG ei kenties voi käyttää avainta enää.  Poista \n"
-"allekirjoitus vain, jos se ei ole jostain syystä pätevä, ja \n"
-"avaimella on jo toinen allekirjoitus."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Muuta valinnat kaikille käyttäjätunnuksille (tai vain valituille)\n"
-"nykyiseen luetteloon valinnoista.  Kaikkien muutettujen\n"
-"oma-allekirjoitusten aikaleima siirretään yhdellä sekunnilla eteenpäin.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Toista edellinen salasanasi varmistuaksesi siitä, mitä kirjoitit."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Anna allekirjoitetun tiedoston nimi"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Vastaa \"kyllä\", jos tiedoston voi ylikirjoittaa"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Syötä uusi tiedostonimi. Jos painat vain RETURN, käytetään\n"
-"oletustiedostoa (joka näkyy sulkeissa)."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Sinun tulisi määrittää syy varmenteelle. Riippuen asiayhteydestä\n"
-"voit valita tästä listasta:\n"
-"  \"Avain on paljastunut\"\n"
-"      Käytä tätä, jos sinulla on syytä uskoa, että luvattomat henkilöt \n"
-"      ovat saaneet salaisen avaimesi käsiinsä.\n"
-"  \"Avain on korvattu\"\n"
-"      Käytä tätä, jos olet korvannut tämän uudemmalla avaimella.\n"
-"  \"Avain ei ole enää käytössä\"\n"
-"      Käytä tätä, jost ole lopettanut tämän avaimen käytön.\n"
-"  \"Käyttäjätunnus ei ole enää voimassa\"\n"
-"      Käytä tätä ilmoittamaan, että käyttäjätunnusta ei pitäisi käyttää;\n"
-"      tätä normaalisti käytetään merkitsemään sähköpostiosoite "
-"vanhenneeksi.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Halutessasi voit kirjoittaa tähän kuvauksen miksi julkaiset tämän\n"
-"mitätöintivarmenteen.  Kirjoita lyhyesti.\n"
-"Tyhjä rivi päättää tekstin.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Ei ohjeita saatavilla"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ei ohjetta aiheesta \"%s\""
@@ -2949,13 +2771,13 @@ msgstr "avain %08lX: uusi avain - ohitetaan\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
@@ -3045,7 +2867,7 @@ msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
@@ -3533,8 +3355,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -3543,20 +3365,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
@@ -3573,7 +3395,7 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
@@ -3939,93 +3761,93 @@ msgstr "salaisen päivitys epäonnistui: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4033,19 +3855,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:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4053,7 +3875,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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4062,75 +3884,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, 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
+#: g10/keyedit.c:3253
 #, 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
+#: g10/keyedit.c:3261
 #, 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
+#: g10/keyedit.c:3262
 #, 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:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4140,199 +3962,199 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 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:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 #, 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:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, 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:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, 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:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, 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:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, 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:5004
+#: g10/keyedit.c:5005
 #, 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:5099
+#: g10/keyedit.c:5100
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4377,12 +4199,12 @@ msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
@@ -4410,109 +4232,119 @@ msgstr "salaa tiedot"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-avainparissa on 1024 bittiä.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4528,7 +4360,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4544,40 +4376,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4585,12 +4417,12 @@ msgstr ""
 "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
 "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4608,44 +4440,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4656,7 +4488,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 
@@ -4671,23 +4503,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4695,12 +4527,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4712,7 +4544,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4724,50 +4556,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4776,12 +4608,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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4789,7 +4621,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4797,26 +4629,26 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -5123,197 +4955,197 @@ msgstr "salattu tuntemattomalla algoritmilla %d\n"
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 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:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, 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:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
@@ -5332,83 +5164,89 @@ msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr ""
+"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "salausalgoritmi ei ole käytössä"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = näytä lisätietoja\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
@@ -6193,30 +6031,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, 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:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
@@ -6545,7 +6383,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
@@ -6573,32 +6411,32 @@ msgstr "tee --check-trustdb, kiitos\n"
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -6738,12 +6576,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6804,11 +6642,11 @@ msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6921,12 +6759,12 @@ msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -6935,7 +6773,7 @@ msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
@@ -6998,22 +6836,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7022,11 +6860,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "apua"
@@ -7067,8 +6905,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@ -7201,61 +7039,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "tarkista allekirjoitus"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7270,7 +7108,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7391,6 +7229,111 @@ msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (vain allekirjoitus)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) RSA (vain salaus)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (salaus ja allekirjoitus)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (vain allekirjoitus)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (vain salaus)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(Kuvausta ei annettu)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Sähköpostiosoite: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Syötä käyttäjätunnus.  Lopeta tyhjällä rivillä: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Syötä uusi tiedostonimi"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7424,195 +7367,195 @@ msgstr "valinta %c%lu on kopio\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "näytä salaiset avaimet"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "käytä oletusavainta oletusvastaanottajana"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "älä käytä lainkaan päätettä"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "käytä aina v3-allekirjoituksia"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "käytä aina MDC:tä salaamiseen"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "eräajo: älä kysy mitään"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "lisää tämä salainen avainrengas luetteloon"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|käytä salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|käytä pakkausalgoritmia N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7623,36 +7566,36 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7759,7 +7702,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7778,31 +7721,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                aka \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -8262,6 +8205,307 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Tämän arvon määrittäminen on sinun tehtäväsi, tätä arvoa ei koskaan \n"
+#~ "kerrota kolmansille osapuolille. Tarvitsemme sitä toteuttamaan \n"
+#~ "luottamusverkko eikä sillä ei ole mitään tekemistä (epäsuorasti "
+#~ "luotujen) \n"
+#~ "varmenneverkkojen kanssa."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Rakentaakseen luottamusverkon, GnuPG:n täytyy tietää mihin avaimiin \n"
+#~ "luotetaan ehdottomasti - nämä ovat tavallisesti ne avaimet, joiden "
+#~ "salainen \n"
+#~ "pari on sinulla.  Vastaa \"kyllä\" luottaaksesi tähän avaimeen ehdoitta\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Vastaa \"kyllä\" jos haluat kaikesta huolimatta käyttää tätä "
+#~ "epäluotettavaa\n"
+#~ "avainta."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr ""
+#~ "Syötä vastaanottajan, jolle haluat lähettää viestin, käyttäjätunnus."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "Yleensä ei ole järkevää käyttää samaa avainta allekirjoitukseen\n"
+#~ "ja salaamiseen. Tätä algorimiä tulisi käyttää vain määrätyissä "
+#~ "ympäristöissä.\n"
+#~ "Ole hyvä ja kysy tietoturva-asiantuntijaltasi ensin"
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Syötä avaimen koko"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Vastaa \"kyllä\" tai \" ei\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Syötä pyydetty arvo kuten näkyy kehotteessa.\n"
+#~ "On mahdollista syöttää ISO-muotoinen päivä (VVVV-KK-PP),\n"
+#~ "mutta sen seurauksena et saa kunnollista virheilmoitusta \n"
+#~ "vaan järjestelmä yrittää tulkita arvon aikajaksona."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Anna avaimen haltijan nimi"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "anna vapaaehtoinen, mutta erittäin suositeltava sähköpostiosoite"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Kirjoita vapaaehtoinen huomautus"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N   muuta nimeä\n"
+#~ "C   muuta kommenttia\n"
+#~ "E   muuta sähköpostiosoitetta\n"
+#~ "O   jatka avaimen luomista\n"
+#~ "L   lopeta"
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Vastaa \"kyllä\" (tai vain \"k\") jos haluat luoda aliavaimen."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Allekirjoittaessasi avaimen käyttäjätunnuksen sinun tulisi varmista, "
+#~ "että \n"
+#~ "avain todella kuuluu henkilölle, joka mainitaan käyttäjätunnuksessa.  "
+#~ "Muiden \n"
+#~ "on hyvä tietää kuinka huolellisesti olet varmistanut tämän. \n"
+#~ "\n"
+#~ "\"0\" tarkoittaa, että et väitä mitään siitä, kuinka huolellisesti olet\n"
+#~ "    varmistanut avaimen.\n"
+#~ "\n"
+#~ "\"1\" tarkoittaa, että uskot avaimen kuuluvan henkilölle, joka väittää \n"
+#~ "    hallitsevan sitä, mutta et voinut varmistaa tai et varmistanut "
+#~ "avainta \n"
+#~ "    lainkaan.  Tämä on hyödyllinen \"persoonan\" varmistamiseen, jossa \n"
+#~ "    allekirjoitat pseudonyymin käyttäjän avaimen.\n"
+#~ "\n"
+#~ "\"2\" tarkoittaa arkista varmistusta.  Esimerkiksi olet varmistanut \n"
+#~ "    avaimen sormenjäljen ja tarkistanut käyttäjätunnuksen ja \n"
+#~ "    valokuvatunnisteen täsmäävän.\n"
+#~ "\n"
+#~ "\"3\" tarkoittaa syvällistä henkilöllisyyden varmistamista.  "
+#~ "Esimerkiksi \n"
+#~ "    tämä voi tarkoittaa avaimen sormenjäljen tarkistamista avaimen "
+#~ "haltijan \n"
+#~ "    kanssa henkilökohtaisesti, ja että tarkistit nimen avaimessa "
+#~ "täsmäävän \n"
+#~ "    vaikeasti väärennettävän kuvallisen henkilöllisyystodistuksen "
+#~ "(kuten \n"
+#~ "    passi) kanssa, ja lopuksi varmistit (sähköpostin vaihtamisella), "
+#~ "että \n"
+#~ "    sähköpostiosoite kuuluu avaimen haltijalle.\n"
+#~ "\n"
+#~ "Huomaa, että yllä annetut esimerkit tasoille 2 ja 3 ovat todellakin "
+#~ "*vain* \n"
+#~ "esimerkkejä.  Lopullisesti se on sinun päätöksesi mitä \"arkinen\" ja \n"
+#~ "\"syvällinen\" tarkoittaa allekirjoittaessasi muita avaimia.\n"
+#~ "\n"
+#~ "Jos et tiedä mikä olisi sopiva vastaus, vastaa \"0\"."
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Vastaa \"kyllä\" jos haluat allekirjoittaa KAIKKI käyttäjätunnukset"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Vastaa \"kyllä\", jos haluat poistaa tämän käyttäjätunnuksen.\n"
+#~ "Menetät samalla kaikki siihen liittyvät varmenteet!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Vastaa \"kyllä\", jos aliavaimen voi poistaa"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Tämä on voimassa oleva allekirjoitus tälle avaimelle, tavallisesti ei \n"
+#~ "kannata poistaa tätä allekirjoitusta koska se saattaa olla tarpeen\n"
+#~ "luottamussuhteen luomiseksi avaimeen tai johonkin toiseen tämän avaimen\n"
+#~ "varmentamaan avaimeen."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Allekirjoitusta ei voida tarkistaa koska sinulla ei ole \n"
+#~ "siihen liittyvää avainta. Lykkää sen poistamista kunnes\n"
+#~ " tiedät mitä avainta on käytetty, koska allekirjoitus \n"
+#~ "avain saattaa luoda luottamusketjun toisen, jo ennalta \n"
+#~ "varmennetun avaimen kautta."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "Allekirjoitus ei ole pätevä.  Järkevintä olisi poistaa se \n"
+#~ "avainrenkaastasi."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Tämä allekirjoitus takaa avaimen haltijan henkilöllisyyden. \n"
+#~ "Tällaisen allekirjoituksen poistaminen on tavallisesti huono \n"
+#~ "ajatus.  GnuPG ei kenties voi käyttää avainta enää.  Poista \n"
+#~ "allekirjoitus vain, jos se ei ole jostain syystä pätevä, ja \n"
+#~ "avaimella on jo toinen allekirjoitus."
+
+#~ 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 ""
+#~ "Muuta valinnat kaikille käyttäjätunnuksille (tai vain valituille)\n"
+#~ "nykyiseen luetteloon valinnoista.  Kaikkien muutettujen\n"
+#~ "oma-allekirjoitusten aikaleima siirretään yhdellä sekunnilla eteenpäin.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "Toista edellinen salasanasi varmistuaksesi siitä, mitä kirjoitit."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Anna allekirjoitetun tiedoston nimi"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Vastaa \"kyllä\", jos tiedoston voi ylikirjoittaa"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Syötä uusi tiedostonimi. Jos painat vain RETURN, käytetään\n"
+#~ "oletustiedostoa (joka näkyy sulkeissa)."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Sinun tulisi määrittää syy varmenteelle. Riippuen asiayhteydestä\n"
+#~ "voit valita tästä listasta:\n"
+#~ "  \"Avain on paljastunut\"\n"
+#~ "      Käytä tätä, jos sinulla on syytä uskoa, että luvattomat henkilöt \n"
+#~ "      ovat saaneet salaisen avaimesi käsiinsä.\n"
+#~ "  \"Avain on korvattu\"\n"
+#~ "      Käytä tätä, jos olet korvannut tämän uudemmalla avaimella.\n"
+#~ "  \"Avain ei ole enää käytössä\"\n"
+#~ "      Käytä tätä, jost ole lopettanut tämän avaimen käytön.\n"
+#~ "  \"Käyttäjätunnus ei ole enää voimassa\"\n"
+#~ "      Käytä tätä ilmoittamaan, että käyttäjätunnusta ei pitäisi käyttää;\n"
+#~ "      tätä normaalisti käytetään merkitsemään sähköpostiosoite "
+#~ "vanhenneeksi.\n"
+
+#~ 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 ""
+#~ "Halutessasi voit kirjoittaa tähän kuvauksen miksi julkaiset tämän\n"
+#~ "mitätöintivarmenteen.  Kirjoita lyhyesti.\n"
+#~ "Tyhjä rivi päättää tekstin.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "notaatiodataa ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
@@ -8420,9 +8664,6 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 #~ msgid "unknown packet type"
 #~ msgstr "tuntematon pakettityyppi"
 
-#~ msgid "unknown version"
-#~ msgstr "tuntematon versio"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "tuntematon julkisen avaimen algoritmi"
 
@@ -8537,9 +8778,6 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 #~ msgid "network error"
 #~ msgstr "verkkovirhe"
 
-#~ msgid "not encrypted"
-#~ msgstr "salaamaton"
-
 #~ msgid "not processed"
 #~ msgstr "ei käsitelty"
 
@@ -8882,9 +9120,6 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 #~ msgid "%08lX: We do NOT trust this key\n"
 #~ msgstr "%08lX: Avaimeen EI luoteta\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (salaus ja allekirjoitus)\n"
-
 #, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "   (%d) RSA (vain allekirjoitus)\n"
diff --git a/po/fr.po b/po/fr.po
index 8c7b061c3..365210c17 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -44,51 +44,51 @@ msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 msgid "Quality:"
 msgstr "validit�: %s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "mauvaise phrase de passe"
@@ -98,21 +98,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -197,8 +197,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
@@ -280,7 +280,7 @@ msgid "Please enter the new passphrase"
 msgstr "changer la phrase de passe"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -299,13 +299,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "bavard"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
@@ -389,8 +389,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -408,29 +408,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
@@ -544,12 +545,12 @@ msgstr "%s: ignor�: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 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:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -620,7 +621,7 @@ msgstr "annul�"
 msgid "error opening `%s': %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fichier d'options `%s': %s\n"
@@ -645,7 +646,7 @@ msgstr "erreur de lecture dans `%s': %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -876,6 +877,145 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "mauvais certificat"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "mauvais certificat"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "lister toutes les donn�es disponibles"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: porte-cl�s cr��\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "validit�: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Algorithmes support�s:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "non chiffr�"
+
+#: common/audit.c:740
+#, fuzzy
+msgid "Number of recipients"
+msgstr "R�cipients actuels:\n"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "v�rification de signature supprim�e\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Signature faite le %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Bonne signature de � %s �"
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "algorithme de hachage `%s' invalide\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Signature faite le %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Cette cl� a expir� !"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "mauvais certificat"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "mauvais certificat"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "mauvais certificat"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "version inconnue"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Pas d'aide disponible pour `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "erreur dans la ligne de remorque\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -995,13 +1135,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
@@ -1172,7 +1312,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
@@ -1278,18 +1418,18 @@ msgstr "Commande invalide  (essayez �help�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1329,7 +1469,7 @@ msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
@@ -1349,7 +1489,7 @@ msgstr "utilisation de l'algorithme de chiffrement %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
@@ -1380,7 +1520,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:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1411,19 +1551,19 @@ msgstr "%s/%s chiffr� pour: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "probl�me de gestion des paquets chiffr�s\n"
 
@@ -1578,7 +1718,7 @@ msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, 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"
@@ -1595,7 +1735,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1611,27 +1751,27 @@ msgstr "|[fichier]|faire une signature"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "lister les cl�s"
 
@@ -1643,11 +1783,11 @@ msgstr "lister les cl�s et les signatures"
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
@@ -1683,11 +1823,11 @@ msgstr "g�n�rer un certificat de r�vocation"
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
@@ -1723,11 +1863,11 @@ msgstr "mettre la base de confiance � jour"
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1738,32 +1878,32 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "lire les options de `%s'\n"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
@@ -1779,7 +1919,7 @@ msgstr "utiliser strictement le comportement OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1787,7 +1927,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1827,7 +1967,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:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1847,11 +1987,11 @@ msgstr "Chiffrement: "
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1859,7 +1999,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
@@ -1954,475 +2094,475 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, 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:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, 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:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, 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:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, 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:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, 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:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 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:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 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:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 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:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, 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:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, 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:3578
+#: g10/gpg.c:3626
 #, 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:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 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"
 
@@ -2436,7 +2576,7 @@ msgstr ""
 "faire en sorte que les conflits d'horodatage ne soient qu'un\n"
 "avertissement non fatal"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
@@ -2452,335 +2592,11 @@ msgstr ""
 "Syntaxe: gpg [options] [fichiers]\n"
 "Verifier des signatures avec des cl�s de confiance connues\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"C'est � vous d'assigner une valeur ici; cette valeur ne sera jamais\n"
-"envoy�e � une tierce personne. Nous en avons besoin pour cr�er le r�seau\n"
-"de confiance (web-of-trust); cela n'a rien � voir avec le r�seau des\n"
-"certificats (cr�� implicitement)"
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Pour mettre en place le R�seau de confiance (Web of Trust), GnuPG a\n"
-"besoin de savoir en quelles cl�s votre confiance est ultime - ce sont\n"
-"en g�n�ral les cl�s dont vous avez acc�s � la cl� secr�te. R�pondez\n"
-"\"oui\" pour indiquer que votre confiance en cette cl� est ultime\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "Si vous voulez utiliser cette cl� peu s�re quand-m�me, r�pondez �oui�."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-"Entrez le nom d'utilisateur de la personne � qui vous voulez envoyer\n"
-"le message."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"S�lectionnez l'algorithme � utiliser.\n"
-"\n"
-"DSA (connu �galement sous le nom de DSS) est un algorithme de signature\n"
-"digitale et ne peut �tre utilis� que pour des signatures.\n"
-"\n"
-"Elgamal est un algorithme pour le chiffrement seul.\n"
-"\n"
-"RSA peut �tre utilis� pour les signatures et le chiffrement.\n"
-"\n"
-"La premi�re cl� (cl� principale) doit toujours �tre une cl� capable\n"
-"de signer."
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"En g�n�ral ce n'est pas une bonne id�e d'utiliser la m�me cl� pour\n"
-"signer et pour chiffrer. Cet algorithme ne doit �tre utilis� que\n"
-"pour certains domaines.\n"
-"Consultez votre expert en s�curit� d'abord."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Entrez la taille de la cl�"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "R�pondez �oui� ou �non�"
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Entrez la valeur demand�e comme indiqu� dans la ligne de commande.\n"
-"On peut entrer une date ISO (AAAA-MM-JJ) mais le r�sultat d'erreur sera\n"
-"mauvais - le syst�me essaierait d'interpr�ter la valeur donn�e comme un\n"
-"intervalle."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Entrez le nom du propri�taire de la cl�"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "entrez une adresse e-mail optionnelle mais hautement recommand�e"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Entrez un commentaire optionnel"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N pour changer le nom.\n"
-"C pour changer le commentaire.\n"
-"E pour changer l'adresse e-mail.\n"
-"O pour continuer � g�n�rer la cl�.\n"
-"Q pour arr�ter de g�n�rer de cl�."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "R�pondez �oui� (ou simplement �o�) pour g�n�rer la sous-cl�"
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Quand vous signez un nom d'utilisateur d'une cl�, vous devriez d'abord\n"
-"v�rifier que la cl� appartient � la personne nomm�e. Il est utile que\n"
-"les autres personnes sachent avec quel soin vous l'avez v�rifi�.\n"
-"\n"
-"\"0\" signifie que vous n'avez pas d'opinon.\n"
-"\n"
-"\"1\" signifie que vous croyez que la cl� appartient � la personne qui\n"
-"dit la poss�der mais vous n'avez pas pu v�rifier du tout la cl�.\n"
-"C'est utile lorsque vous signez la cl� d'un pseudonyme.\n"
-"\n"
-"\"2\" signifie que vous avez un peu v�rifi� la cl�. Par exemple, cela\n"
-"pourrait �tre un v�rification de l'empreinte et du nom de\n"
-"l'utilisateur avec la photo.\n"
-"\n"
-"\"3\" signifie que vous avez compl�tement v�rifi� la cl�. Par exemple,\n"
-"cela pourrait �tre une v�rification de l'empreinte, du nom de\n"
-"l'utilisateur avec un document difficile � contrefaire (comme un\n"
-"passeport) et de son adresse e-mail (v�rifi� par un �change de\n"
-"courrier �lectronique).\n"
-"\n"
-"Notez bien que les exemples donn�s ci-dessus pour les niveaux 2 et\n"
-"3 ne sont *que* des exemples.\n"
-"C'est � vous de d�cider quelle valeur mettre quand vous signez\n"
-"les cl�s des autres personnes.\n"
-"\n"
-"Si vous ne savez pas quelle r�ponse est la bonne, r�pondez \"0\"."
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "R�pondez �oui� si vous voulez signer TOUS les noms d'utilisateurs"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"R�pondez �oui� si vous voulez vraiment supprimer ce nom\n"
-"d'utilisateur. Tous les certificats seront alors perdus en m�me temps !"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "R�pondez �oui� s'il faut vraiment supprimer la sous-cl�"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"C'est une signature valide dans la cl�; vous n'avez pas normalement\n"
-"int�r�t � supprimer cette signature car elle peut �tre importante pour\n"
-"�tablir une connection de confiance vers la cl� ou une autre cl� certifi�e\n"
-"par celle-l�."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Cette signature ne peut pas �tre v�rifi�e parce que vous n'avez pas la\n"
-"cl� correspondante. Vous devriez remettre sa supression jusqu'� ce que\n"
-"vous soyez s�r de quelle cl� a �t� utilis�e car cette cl� de signature\n"
-"peut �tablir une connection de confiance vers une autre cl� d�j� certifi�e."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-"Cette signature n'est pas valide. Vous devriez la supprimer de votre\n"
-"porte-cl�s."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Cette signature relie le nom d'utilisateur � la cl�. Habituellement\n"
-"enlever une telle signature n'est pas une bonne id�e. En fait GnuPG peut\n"
-"ne plus �tre capable d'utiliser cette cl�. Donc faites ceci uniquement si\n"
-"cette auto-signature est invalide pour une certaine raison et si une autre\n"
-"est disponible."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Changer les pr�f�rences de tous les noms d'utilisateurs (ou juste\n"
-"ceux qui sont s�lectionn�s) vers la liste actuelle. La date de toutes\n"
-"les auto-signatures affect�es seront avanc�es d'une seconde.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-"R�p�tez la derni�re phrase de passe pour �tre s�r de ce que vous\n"
-"avez tap�."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Donnez le nom du fichier auquel la signature se rapporte"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "R�pondez �oui� s'il faut vraiment r��crire le fichier"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Entrez le nouveau nom de fichier. Si vous tapez simplement ENTR�E le\n"
-"fichier par d�faut (indiqu� entre crochets) sera utilis�."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Vous devriez donner une raison pour la certification. Selon le contexte\n"
-"vous pouvez choisir dans cette liste:\n"
-"  �La cl� a �t� compromise�\n"
-"      Utilisez cette option si vous avez une raison de croire que des\n"
-"      personnes ont pu acc�der � votre cl� secr�te sans autorisation.\n"
-"  �La cl� a �t� remplac�e�\n"
-"      Utilisez cette option si vous avez remplac� la cl� par une nouvelle.\n"
-"  �La cl� n'est plus utilis�e�\n"
-"      Utilisez cette option si cette cl� n'a plus d'utilit�.\n"
-"  �Le nom d'utilisateur n'est plus valide�\n"
-"      Utilisez cette option si le nom d'utilisateur ne doit plus �tre\n"
-"      utilis�. Cela sert g�n�ralement � indiquer qu'une adresse e-mail\n"
-"      est invalide.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Si vous le d�sirez, vous pouvez entrer un texte qui explique pourquoi vous\n"
-"avez �mis ce certificat de r�vocation. Essayez de garder ce texte concis.\n"
-"Une ligne vide d�limite la fin du texte.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Pas d'aide disponible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
@@ -2979,13 +2795,13 @@ msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
@@ -3076,7 +2892,7 @@ msgstr ""
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
@@ -3545,8 +3361,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:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
@@ -3557,21 +3373,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 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:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
@@ -3586,7 +3402,7 @@ msgid ""
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
@@ -3936,23 +3752,23 @@ msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 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:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3960,73 +3776,73 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4034,17 +3850,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:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4053,7 +3869,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4063,75 +3879,75 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 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:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "invalide"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4141,202 +3957,202 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 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:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une sous-cl�.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une sous-cl�.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, 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:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 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:4147
+#: g10/keyedit.c:4148
 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:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notation de signature: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-cl� avec l'index %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 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:4659
+#: g10/keyedit.c:4660
 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:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, 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:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La cl� %s est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4381,12 +4197,12 @@ msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
@@ -4412,109 +4228,119 @@ msgstr "Chiffrer"
 msgid "Authenticate"
 msgstr "Authentifier"
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Actions possibles pour une cl� %s: "
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises: "
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacit� de signer\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacit� de chiffrement\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacit� d'authentifier\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Termin�\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La paire de cl�s DSA fera %u bits.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "les cl�s %s peuvent faire entre %u et %u bits de longueur.\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "les tailles de cl�s %s doivent �tre dans l'intervalle %u-%u\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4530,7 +4356,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4546,38 +4372,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La signature est valide pour ? (%s) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4585,11 +4411,11 @@ msgstr ""
 "Votre syst�me ne sait pas afficher les dates au-del� de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'� 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4605,44 +4431,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4653,7 +4479,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
@@ -4669,23 +4495,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4694,12 +4520,12 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4713,7 +4539,7 @@ msgstr ""
 "� --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4725,52 +4551,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:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique dans `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'une cl� secr�te partielle dans `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, 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:3349
+#: g10/keygen.c:3363
 #, 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:3369
+#: g10/keygen.c:3383
 #, 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:3377
+#: g10/keygen.c:3391
 #, 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:3404
+#: g10/keygen.c:3418
 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:3415
+#: g10/keygen.c:3429
 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"
@@ -4779,13 +4605,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une sous-cl� �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, 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:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4793,7 +4619,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:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4801,26 +4627,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:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, 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:3891
+#: g10/keygen.c:3905
 #, 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:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
@@ -5132,179 +4958,179 @@ msgstr "phrase de passe g�n�r�e avec l'algorithme de hachage %d inconnu\n"
 msgid "public key is %s\n"
 msgstr "la cl� publique est %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 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:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      � %s �\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffr� avec une cl� %s, ID %s\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffr� avec %lu phrases de passe\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffr� avec 1 phrase de passe\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 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:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISSEMENT: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               en utilisant la cl� %s %s\n"
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de � %s �"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expir�e de � %s �"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias � %s �"
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -5312,16 +5138,16 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -5342,86 +5168,91 @@ msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme exp�rimental � cl�\n"
 "publique %s\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "AVERTISSEMENT: l'algorithme de hachage %s est d�conseill�\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme exp�rimental de chiffrement\n"
 "%s\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr ""
 "AVERTISSEMENT: utilisation de l'algorithme de hachage\n"
 "exp�rimental %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISSEMENT: l'algorithme de hachage %s est d�conseill�\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, 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:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Non-compress�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
@@ -6208,13 +6039,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6222,17 +6053,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:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
@@ -6561,7 +6392,7 @@ msgstr "ultime"
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine v�rification de la base de confiance aura lieu le %s\n"
@@ -6593,28 +6424,28 @@ msgstr "faites un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d cl�s trait�es (%d comptes de validit� r�initialis�s)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "la cl� publique de la cl� de confiance ultime %s est introuvable\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginale(s) n�cessaires, %d compl�te(s) n�cessaires, mod�le\n"
 "de confiance %s\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6622,7 +6453,7 @@ msgstr ""
 "profondeur: %d  valide: %3d  sign�: %3d\n"
 "confiance: %d-. %dg. %dn. %dm. %df. %du\n"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6767,12 +6598,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
@@ -6835,11 +6666,11 @@ msgstr "la v�rification CHV%d a �chou�: %s\n"
 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:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 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:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
@@ -6950,14 +6781,14 @@ msgstr "signature %s, algorithme de hachage %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 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:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
@@ -6966,7 +6797,7 @@ msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "lire les options de `%s'\n"
@@ -7026,22 +6857,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caract�re %02X invalide en radix64 ignor�\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7050,11 +6881,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 msgid "shell"
 msgstr ""
 
@@ -7094,8 +6925,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
@@ -7229,61 +7060,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, 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:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "v�rifier une signature"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "pr�f�rence `%s' dupliqu�e\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "Certificat de r�vocation cr��.\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "mauvais certificat"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7298,7 +7129,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7422,6 +7253,112 @@ msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (signature seule)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (2) Cl� de chiffrement\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, fuzzy, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "Actions possibles pour une cl� %s: "
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) DSA (signature seule)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (signature seule)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (chiffrement seul)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(Aucune description donn�e)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "algorithme de hachage `%s' invalide\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Adresse e-mail: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Entrez le nom d'utilisateur, en terminant par une ligne vide: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Entrez le nouveau nom de fichier"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Entrez une description optionnelle ; terminez-l� par une ligne vide:\n"
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "Entrez le code PIN: "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7455,204 +7392,204 @@ 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:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "lister les cl�s secr�tes"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "register a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "changer la phrase de passe"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "lire les options de `%s'\n"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "v�rifier les signatures"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "algorithme de chiffrement inconnu"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "algorithme de compression inconnu"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7663,36 +7600,36 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "utilisation: gpg [options] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7803,7 +7740,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7822,33 +7759,33 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Signature faite le %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Bonne signature de � %s �"
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                alias � %s �"
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Ceci sera une auto-signature.\n"
@@ -8307,6 +8244,325 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "le hachage de protection %d n'est pas support�\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "C'est � vous d'assigner une valeur ici; cette valeur ne sera jamais\n"
+#~ "envoy�e � une tierce personne. Nous en avons besoin pour cr�er le r�seau\n"
+#~ "de confiance (web-of-trust); cela n'a rien � voir avec le r�seau des\n"
+#~ "certificats (cr�� implicitement)"
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Pour mettre en place le R�seau de confiance (Web of Trust), GnuPG a\n"
+#~ "besoin de savoir en quelles cl�s votre confiance est ultime - ce sont\n"
+#~ "en g�n�ral les cl�s dont vous avez acc�s � la cl� secr�te. R�pondez\n"
+#~ "\"oui\" pour indiquer que votre confiance en cette cl� est ultime\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Si vous voulez utiliser cette cl� peu s�re quand-m�me, r�pondez �oui�."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr ""
+#~ "Entrez le nom d'utilisateur de la personne � qui vous voulez envoyer\n"
+#~ "le message."
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "S�lectionnez l'algorithme � utiliser.\n"
+#~ "\n"
+#~ "DSA (connu �galement sous le nom de DSS) est un algorithme de signature\n"
+#~ "digitale et ne peut �tre utilis� que pour des signatures.\n"
+#~ "\n"
+#~ "Elgamal est un algorithme pour le chiffrement seul.\n"
+#~ "\n"
+#~ "RSA peut �tre utilis� pour les signatures et le chiffrement.\n"
+#~ "\n"
+#~ "La premi�re cl� (cl� principale) doit toujours �tre une cl� capable\n"
+#~ "de signer."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "En g�n�ral ce n'est pas une bonne id�e d'utiliser la m�me cl� pour\n"
+#~ "signer et pour chiffrer. Cet algorithme ne doit �tre utilis� que\n"
+#~ "pour certains domaines.\n"
+#~ "Consultez votre expert en s�curit� d'abord."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Entrez la taille de la cl�"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "R�pondez �oui� ou �non�"
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Entrez la valeur demand�e comme indiqu� dans la ligne de commande.\n"
+#~ "On peut entrer une date ISO (AAAA-MM-JJ) mais le r�sultat d'erreur sera\n"
+#~ "mauvais - le syst�me essaierait d'interpr�ter la valeur donn�e comme un\n"
+#~ "intervalle."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Entrez le nom du propri�taire de la cl�"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "entrez une adresse e-mail optionnelle mais hautement recommand�e"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Entrez un commentaire optionnel"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N pour changer le nom.\n"
+#~ "C pour changer le commentaire.\n"
+#~ "E pour changer l'adresse e-mail.\n"
+#~ "O pour continuer � g�n�rer la cl�.\n"
+#~ "Q pour arr�ter de g�n�rer de cl�."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "R�pondez �oui� (ou simplement �o�) pour g�n�rer la sous-cl�"
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Quand vous signez un nom d'utilisateur d'une cl�, vous devriez d'abord\n"
+#~ "v�rifier que la cl� appartient � la personne nomm�e. Il est utile que\n"
+#~ "les autres personnes sachent avec quel soin vous l'avez v�rifi�.\n"
+#~ "\n"
+#~ "\"0\" signifie que vous n'avez pas d'opinon.\n"
+#~ "\n"
+#~ "\"1\" signifie que vous croyez que la cl� appartient � la personne qui\n"
+#~ "dit la poss�der mais vous n'avez pas pu v�rifier du tout la cl�.\n"
+#~ "C'est utile lorsque vous signez la cl� d'un pseudonyme.\n"
+#~ "\n"
+#~ "\"2\" signifie que vous avez un peu v�rifi� la cl�. Par exemple, cela\n"
+#~ "pourrait �tre un v�rification de l'empreinte et du nom de\n"
+#~ "l'utilisateur avec la photo.\n"
+#~ "\n"
+#~ "\"3\" signifie que vous avez compl�tement v�rifi� la cl�. Par exemple,\n"
+#~ "cela pourrait �tre une v�rification de l'empreinte, du nom de\n"
+#~ "l'utilisateur avec un document difficile � contrefaire (comme un\n"
+#~ "passeport) et de son adresse e-mail (v�rifi� par un �change de\n"
+#~ "courrier �lectronique).\n"
+#~ "\n"
+#~ "Notez bien que les exemples donn�s ci-dessus pour les niveaux 2 et\n"
+#~ "3 ne sont *que* des exemples.\n"
+#~ "C'est � vous de d�cider quelle valeur mettre quand vous signez\n"
+#~ "les cl�s des autres personnes.\n"
+#~ "\n"
+#~ "Si vous ne savez pas quelle r�ponse est la bonne, r�pondez \"0\"."
+
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "R�pondez �oui� si vous voulez signer TOUS les noms d'utilisateurs"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "R�pondez �oui� si vous voulez vraiment supprimer ce nom\n"
+#~ "d'utilisateur. Tous les certificats seront alors perdus en m�me temps !"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "R�pondez �oui� s'il faut vraiment supprimer la sous-cl�"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "C'est une signature valide dans la cl�; vous n'avez pas normalement\n"
+#~ "int�r�t � supprimer cette signature car elle peut �tre importante pour\n"
+#~ "�tablir une connection de confiance vers la cl� ou une autre cl� "
+#~ "certifi�e\n"
+#~ "par celle-l�."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Cette signature ne peut pas �tre v�rifi�e parce que vous n'avez pas la\n"
+#~ "cl� correspondante. Vous devriez remettre sa supression jusqu'� ce que\n"
+#~ "vous soyez s�r de quelle cl� a �t� utilis�e car cette cl� de signature\n"
+#~ "peut �tablir une connection de confiance vers une autre cl� d�j� "
+#~ "certifi�e."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "Cette signature n'est pas valide. Vous devriez la supprimer de votre\n"
+#~ "porte-cl�s."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Cette signature relie le nom d'utilisateur � la cl�. Habituellement\n"
+#~ "enlever une telle signature n'est pas une bonne id�e. En fait GnuPG peut\n"
+#~ "ne plus �tre capable d'utiliser cette cl�. Donc faites ceci uniquement "
+#~ "si\n"
+#~ "cette auto-signature est invalide pour une certaine raison et si une "
+#~ "autre\n"
+#~ "est disponible."
+
+#~ 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 ""
+#~ "Changer les pr�f�rences de tous les noms d'utilisateurs (ou juste\n"
+#~ "ceux qui sont s�lectionn�s) vers la liste actuelle. La date de toutes\n"
+#~ "les auto-signatures affect�es seront avanc�es d'une seconde.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr ""
+#~ "R�p�tez la derni�re phrase de passe pour �tre s�r de ce que vous\n"
+#~ "avez tap�."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Donnez le nom du fichier auquel la signature se rapporte"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "R�pondez �oui� s'il faut vraiment r��crire le fichier"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Entrez le nouveau nom de fichier. Si vous tapez simplement ENTR�E le\n"
+#~ "fichier par d�faut (indiqu� entre crochets) sera utilis�."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Vous devriez donner une raison pour la certification. Selon le contexte\n"
+#~ "vous pouvez choisir dans cette liste:\n"
+#~ "  �La cl� a �t� compromise�\n"
+#~ "      Utilisez cette option si vous avez une raison de croire que des\n"
+#~ "      personnes ont pu acc�der � votre cl� secr�te sans autorisation.\n"
+#~ "  �La cl� a �t� remplac�e�\n"
+#~ "      Utilisez cette option si vous avez remplac� la cl� par une "
+#~ "nouvelle.\n"
+#~ "  �La cl� n'est plus utilis�e�\n"
+#~ "      Utilisez cette option si cette cl� n'a plus d'utilit�.\n"
+#~ "  �Le nom d'utilisateur n'est plus valide�\n"
+#~ "      Utilisez cette option si le nom d'utilisateur ne doit plus �tre\n"
+#~ "      utilis�. Cela sert g�n�ralement � indiquer qu'une adresse e-mail\n"
+#~ "      est invalide.\n"
+
+#~ 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 ""
+#~ "Si vous le d�sirez, vous pouvez entrer un texte qui explique pourquoi "
+#~ "vous\n"
+#~ "avez �mis ce certificat de r�vocation. Essayez de garder ce texte "
+#~ "concis.\n"
+#~ "Une ligne vide d�limite la fin du texte.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "impossible de mettre des donn�es de notation dans des signatures v3\n"
@@ -8475,9 +8731,6 @@ msgstr "le hachage de protection %d n'est pas support�\n"
 #~ msgid "Enter Admin PIN: "
 #~ msgstr "Entrez le code PIN admin: "
 
-#~ msgid "Enter PIN: "
-#~ msgstr "Entrez le code PIN: "
-
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "NOTE: %s n'est pas disponible dans cette version\n"
 
@@ -8491,9 +8744,6 @@ msgstr "le hachage de protection %d n'est pas support�\n"
 #~ msgid "unknown packet type"
 #~ msgstr "type de paquet inconnu"
 
-#~ msgid "unknown version"
-#~ msgstr "version inconnue"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "algorithme � cl� publique inconnu"
 
@@ -8602,9 +8852,6 @@ msgstr "le hachage de protection %d n'est pas support�\n"
 #~ msgid "network error"
 #~ msgstr "erreur de r�seau"
 
-#~ msgid "not encrypted"
-#~ msgstr "non chiffr�"
-
 #~ msgid "not processed"
 #~ msgstr "non trait�"
 
diff --git a/po/gl.po b/po/gl.po
index e5d833e01..b13c831b1 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -38,51 +38,51 @@ msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "li�a longa de m�is\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non v�lido no nome\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI err�neo"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal err�neo"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "contrasinal err�neo"
@@ -92,21 +92,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -189,8 +189,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -269,7 +269,7 @@ msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -288,13 +288,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "lareto"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
@@ -378,8 +378,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -397,29 +397,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
@@ -531,12 +532,12 @@ msgstr "\t%lu chaves omitidas\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -607,7 +608,7 @@ msgstr "Cancelar"
 msgid "error opening `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
@@ -632,7 +633,7 @@ msgstr "erro de lectura: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -859,6 +860,148 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr ""
+"Non se atoparon certificados con confianza non definida.\n"
+"\n"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "Chave dispo�ible en: "
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: chaveiro creado\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "armadura: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Algoritmos soportados:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "non cifrado"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "verificaci�n de sinatura suprimida\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "A sinatura caducou o %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Sinatura correcta de \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "algoritmo de hash non v�lido `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "A sinatura caducou o %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Revocaci�n de certificado v�lida"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr ""
+"Non se atoparon certificados con confianza non definida.\n"
+"\n"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "Certificado correcto"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "Certificado non v�lido"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "versi�n desco�ecida"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Non hai axuda dispo�ible para `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "error nunha li�a adicional\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -981,14 +1124,14 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
@@ -1167,7 +1310,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
@@ -1284,18 +1427,18 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1339,7 +1482,7 @@ msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -1358,7 +1501,7 @@ msgstr "fallou a sinatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
@@ -1386,7 +1529,7 @@ msgid ""
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1416,17 +1559,17 @@ msgstr "%s/%s cifrado para: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao manexa-lo paquete cifrado\n"
 
@@ -1580,7 +1723,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1596,7 +1739,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1612,27 +1755,27 @@ msgstr "|[ficheiro]|facer unha sinatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
@@ -1645,11 +1788,11 @@ msgstr "ve-la lista de chaves e sinaturas"
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
@@ -1685,11 +1828,11 @@ msgstr "xerar un certificado de revocaci�n"
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
@@ -1725,11 +1868,11 @@ msgstr "actualiza-la base de datos de confianza"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1740,32 +1883,32 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
@@ -1781,7 +1924,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1789,7 +1932,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1829,7 +1972,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1849,11 +1992,11 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1861,7 +2004,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
@@ -1932,469 +2075,469 @@ msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, 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:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, 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:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, 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:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 #, 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:3048
+#: g10/gpg.c:3096
 #, 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:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, 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:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 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:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -2407,7 +2550,7 @@ msgstr "toma-las chaves deste chaveiro"
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
@@ -2423,321 +2566,11 @@ msgstr ""
 "Sintaxe: gpg [opci�ns] [ficheiros]\n"
 "Comproba as sinaturas contra chaves de confianza co�ecidas\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"A asignaci�n dun valor aqu� � cousa s�a; este valor nunca se ha exportar\n"
-"a ning�n terceiro. Prec�sase para implementa-la rede de confianza; non ten\n"
-"nada que ver coa rede de certificados."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Para constru�-la Rede-de-Confianza, GnuPG precisa saber que chaves te�en\n"
-"confianza absoluta - esas adoitan se-las chaves das que ten acceso � chave\n"
-"secreta. Responda \"si\" para lle dar confianza total a esta chave\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "Se desexa empregar esta clave na que non se conf�a, conteste \"si\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Introduza o ID de usuario da persoa � que lle quere manda-la mensaxe."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"En xeral non � unha boa idea emprega-la mesma chave para asinar e cifrar.\n"
-"Este algoritmo deber�a empregarse s� en determinados dominios.\n"
-"Consulte antes co seu experto en seguridade."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Introduza o tama�o da chave"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Conteste \"si\" ou \"non\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Introduza o valor requerido tal como se amosa no indicativo.\n"
-"� posible introducir unha data ISO (AAA-MM-DD) pero non ha obter unha\n"
-"boa resposta de erro - no canto diso, o sistema ha tratar de interpreta-lo\n"
-"valor proporcionado coma se fora un intervalo."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Introduza o nome do propietario da chave"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "por favor, introduza un enderezo de e-mail (opcional pero recomendado)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Por favor, introduza un comentario (opcional)"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  para cambia-lo nome.\n"
-"C  para cambia-lo comentario.\n"
-"E  para cambia-lo enderezo de e-mail.\n"
-"O  para continuar coa xeraci�n da chave.\n"
-"S  para sa�r da xeraci�n da chave."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Conteste \"si\" (ou s� \"s\") se � correcto xerar esta subchave."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Cando asina un ID de usuario dunha chave, deber�a comprobar antes\n"
-"que a chave pertence � persoa que aparece no identificador. � �til para os\n"
-"demais saber con canto tino comprobou isto.\n"
-"\n"
-"\"0\" significa que non di nada do coidado co que comprobou a chave.\n"
-"\n"
-"\"1\" significa que cre que a chave pertence � persoa que o afirma, pero "
-"non\n"
-"    puido ou non quixo verifica-la chave. � �til para verificaci�ns de\n"
-"    \"personaxes\", nas que asina a chave dun usuario pseud�nimo.\n"
-"\n"
-"\"2\" significa que fixo unha comprobaci�n informal da chave. Por exemplo,\n"
-"    pode significar que comprobou a pegada dixital da chave e comprobou\n"
-"    a identidade do usuario na chave contra unha identificaci�n "
-"fotogr�fica.\n"
-"\n"
-"\"3\" significa que fixo unha comprobaci�n extensiva da chave. Por exemplo,\n"
-"    pode significar que comprobou a pegada dixital da chave co propietario\n"
-"    da chave en persoa, e que comprobou, cun documento dif�cil de "
-"falsificar\n"
-"    cunha identificaci�n fotogr�fica (coma o carnet de identidade ou\n"
-"    pasaporte) que o nome do propietario da chave coincide co do "
-"identificador\n"
-"    de usuario da chave, e que comprobou (por intercambio de correo\n"
-"    electr�nico) que o enderezo de e-mail da chave pertence ao propietario\n"
-"    da chave.\n"
-"\n"
-"Te�a en conta que os exemplos de enriba para os niveis 2 e 3 son *s�*\n"
-"exemplos. � final, depende de vostede decidir que significan \"informal\" e\n"
-"\"extensivo\" ao asinar outras chaves.\n"
-"\n"
-"Se non sabe cal � a resposta correcta, resposte \"0\"."
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Conteste \"si\" se quere asinar T�DOLOS IDs de usuario"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Conteste \"si\" se realmente desexa borrar este ID de usuario.\n"
-"�Tam�n se han perder t�dolos certificados!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Conteste \"si\" se � correcto borrar esta subchave"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Esta � unha sinatura v�lida na chave; normalmente non ha borrar esta\n"
-"sinatura porque pode ser importante para estabrecer unha conexi�n de\n"
-"confianza na chave ou noutra chave certificada por esta chave."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Non se pode verificar esta sinatura porque non pos�e a chave\n"
-"correspondente. Deber�a retrasa-lo borrado ata que saiba que chave\n"
-"se empregou porque esta chave de sinatura poder�a estabrecer unha\n"
-"conexi�n de confianza mediante outra chave xa certificada."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "A sinatura non � correcta. Ten sentido borrala do chaveiro."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Esta � unha sinatura que liga o ID de usuario � chave. Normalmente\n"
-"non � unha boa idea borrar unha sinatura como esta. De feito,\n"
-"GnuPG pode non ser capaz de usar m�is esta chave. As� que faga isto\n"
-"s� se esta auto-sinatura non � correcta por algun motivo e hai\n"
-"unha segunda � s�a disposici�n."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Cambia-las preferencias de t�dolos IDs de usuario (ou s� dos seleccionados)\n"
-"� lista actual de preferencias. A marca de tempo de t�dalas auto-sinaturas\n"
-"afectadas ha avanzar un segundo.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-"Por favor, repita o �ltimo contrasinal, para estar seguro do que tecleou."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Introduza o nome do ficheiro ao que corresponde a sinatura"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Conteste \"si\" se � correcto sobrescribi-lo ficheiro"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Por favor, introduza un novo nome de ficheiro. Se s� preme ENTER, hase\n"
-"emprega-lo ficheiro por defecto (que se amosa entre corchetes)."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Deber�a especificar un motivo para o certificado. Dependendo do contexto\n"
-"pode escoller desta lista:\n"
-"  \"Descobreuse a chave\"\n"
-"     Empr�gueo se ten motivos para crer que algunha persoa non autorizada\n"
-"     obtivo acceso � s�a chave secreta.\n"
-"  \"A chave � obsoleta\"\n"
-"     Empr�gueo se cambiou esta chave cunha m�is recente.\n"
-"  \"Xa non se emprega a chave\"\n"
-"     Empr�gueo se retirou esta chave.\n"
-"  \"O ID de usuario xa non � v�lido\"\n"
-"     Empr�gueo para indicar que o ID de usuario xa non se deber�a empregar;\n"
-"     adoita empregarse para marcar un enderezo de correo non v�lido.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Se quere, pode introducir un texto que describa por que emite este\n"
-"certificado de revocaci�n. Por favor, mante�a este texto breve.\n"
-"Unha li�a en branco remata o texto.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Non hai axuda dispo�ible"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispo�ible para `%s'"
@@ -2932,13 +2765,13 @@ msgstr "chave %08lX: nova chave - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
@@ -3032,7 +2865,7 @@ msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
@@ -3521,8 +3354,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -3531,20 +3364,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 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:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
@@ -3561,7 +3394,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
@@ -3935,93 +3768,93 @@ msgstr "o segredo da actualizaci�n fallou: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4029,19 +3862,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:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4049,7 +3882,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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4058,77 +3891,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4138,204 +3971,204 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, 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:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 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:4686
+#: g10/keyedit.c:4687
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4379,12 +4212,12 @@ msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
@@ -4412,109 +4245,119 @@ msgstr "cifrar datos"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4530,7 +4373,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4546,40 +4389,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4587,12 +4430,12 @@ msgstr ""
 "O seu sistema non pode amosar datas m�is al� do 2038.\n"
 "A�nda as�, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4609,44 +4452,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4657,7 +4500,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
@@ -4673,23 +4516,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4697,12 +4540,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4714,7 +4557,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4726,50 +4569,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:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, 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:3349
+#: g10/keygen.c:3363
 #, 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:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 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:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4779,12 +4622,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4792,7 +4635,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4800,26 +4643,26 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -5125,192 +4968,192 @@ msgstr "cifrado cun algoritmo desco�ecido %d\n"
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
@@ -5331,82 +5174,88 @@ msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr ""
+"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de cifrado non implementado"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 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:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = amosar m�is informaci�n\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
@@ -6188,28 +6037,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, 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:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
@@ -6541,7 +6390,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
@@ -6569,32 +6418,32 @@ msgstr "por favor, execute con --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@ -6736,12 +6585,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6802,11 +6651,11 @@ msgstr "o env�o ao servidor de chaves fallou: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6918,12 +6767,12 @@ msgstr "Sinatura %s, algoritmo de resumo %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
@@ -6932,7 +6781,7 @@ msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "lendo as opci�ns de `%s'\n"
@@ -6995,22 +6844,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7019,11 +6868,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "axuda"
@@ -7064,8 +6913,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
@@ -7203,68 +7052,68 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar unha sinatura"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "certificado duplicado - borrado"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7279,7 +7128,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7400,6 +7249,112 @@ msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (s� asinar)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) RSA (s� cifrar)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (asinar e cifrar)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (s� asinar)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (s� cifrar)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(Non se deu unha descrici�n)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "algoritmo de hash non v�lido `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Enderezo de E-mail: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Introduza o ID de usuario. Remate cunha li�a en branco: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Introduza o novo nome de ficheiro"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "Introduza o ID de usuario: "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7433,195 +7388,195 @@ msgstr "certificado duplicado - borrado"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "usa-la chave por defecto coma o destinatario por defecto"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maior�a das preguntas"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "asumir `non' na maior�a das preguntas"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "engadir este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|emprega-lo algoritmo de compresi�n N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7632,36 +7587,36 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7768,7 +7723,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7787,31 +7742,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "A sinatura caducou o %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Sinatura correcta de \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "               alias \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -8274,6 +8229,307 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "A asignaci�n dun valor aqu� � cousa s�a; este valor nunca se ha exportar\n"
+#~ "a ning�n terceiro. Prec�sase para implementa-la rede de confianza; non "
+#~ "ten\n"
+#~ "nada que ver coa rede de certificados."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Para constru�-la Rede-de-Confianza, GnuPG precisa saber que chaves te�en\n"
+#~ "confianza absoluta - esas adoitan se-las chaves das que ten acceso � "
+#~ "chave\n"
+#~ "secreta. Responda \"si\" para lle dar confianza total a esta chave\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Se desexa empregar esta clave na que non se conf�a, conteste \"si\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr ""
+#~ "Introduza o ID de usuario da persoa � que lle quere manda-la mensaxe."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "En xeral non � unha boa idea emprega-la mesma chave para asinar e "
+#~ "cifrar.\n"
+#~ "Este algoritmo deber�a empregarse s� en determinados dominios.\n"
+#~ "Consulte antes co seu experto en seguridade."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Introduza o tama�o da chave"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Conteste \"si\" ou \"non\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Introduza o valor requerido tal como se amosa no indicativo.\n"
+#~ "� posible introducir unha data ISO (AAA-MM-DD) pero non ha obter unha\n"
+#~ "boa resposta de erro - no canto diso, o sistema ha tratar de interpreta-"
+#~ "lo\n"
+#~ "valor proporcionado coma se fora un intervalo."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Introduza o nome do propietario da chave"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr ""
+#~ "por favor, introduza un enderezo de e-mail (opcional pero recomendado)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Por favor, introduza un comentario (opcional)"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  para cambia-lo nome.\n"
+#~ "C  para cambia-lo comentario.\n"
+#~ "E  para cambia-lo enderezo de e-mail.\n"
+#~ "O  para continuar coa xeraci�n da chave.\n"
+#~ "S  para sa�r da xeraci�n da chave."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Conteste \"si\" (ou s� \"s\") se � correcto xerar esta subchave."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Cando asina un ID de usuario dunha chave, deber�a comprobar antes\n"
+#~ "que a chave pertence � persoa que aparece no identificador. � �til para "
+#~ "os\n"
+#~ "demais saber con canto tino comprobou isto.\n"
+#~ "\n"
+#~ "\"0\" significa que non di nada do coidado co que comprobou a chave.\n"
+#~ "\n"
+#~ "\"1\" significa que cre que a chave pertence � persoa que o afirma, pero "
+#~ "non\n"
+#~ "    puido ou non quixo verifica-la chave. � �til para verificaci�ns de\n"
+#~ "    \"personaxes\", nas que asina a chave dun usuario pseud�nimo.\n"
+#~ "\n"
+#~ "\"2\" significa que fixo unha comprobaci�n informal da chave. Por "
+#~ "exemplo,\n"
+#~ "    pode significar que comprobou a pegada dixital da chave e comprobou\n"
+#~ "    a identidade do usuario na chave contra unha identificaci�n "
+#~ "fotogr�fica.\n"
+#~ "\n"
+#~ "\"3\" significa que fixo unha comprobaci�n extensiva da chave. Por "
+#~ "exemplo,\n"
+#~ "    pode significar que comprobou a pegada dixital da chave co "
+#~ "propietario\n"
+#~ "    da chave en persoa, e que comprobou, cun documento dif�cil de "
+#~ "falsificar\n"
+#~ "    cunha identificaci�n fotogr�fica (coma o carnet de identidade ou\n"
+#~ "    pasaporte) que o nome do propietario da chave coincide co do "
+#~ "identificador\n"
+#~ "    de usuario da chave, e que comprobou (por intercambio de correo\n"
+#~ "    electr�nico) que o enderezo de e-mail da chave pertence ao "
+#~ "propietario\n"
+#~ "    da chave.\n"
+#~ "\n"
+#~ "Te�a en conta que os exemplos de enriba para os niveis 2 e 3 son *s�*\n"
+#~ "exemplos. � final, depende de vostede decidir que significan \"informal\" "
+#~ "e\n"
+#~ "\"extensivo\" ao asinar outras chaves.\n"
+#~ "\n"
+#~ "Se non sabe cal � a resposta correcta, resposte \"0\"."
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Conteste \"si\" se quere asinar T�DOLOS IDs de usuario"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Conteste \"si\" se realmente desexa borrar este ID de usuario.\n"
+#~ "�Tam�n se han perder t�dolos certificados!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Conteste \"si\" se � correcto borrar esta subchave"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Esta � unha sinatura v�lida na chave; normalmente non ha borrar esta\n"
+#~ "sinatura porque pode ser importante para estabrecer unha conexi�n de\n"
+#~ "confianza na chave ou noutra chave certificada por esta chave."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Non se pode verificar esta sinatura porque non pos�e a chave\n"
+#~ "correspondente. Deber�a retrasa-lo borrado ata que saiba que chave\n"
+#~ "se empregou porque esta chave de sinatura poder�a estabrecer unha\n"
+#~ "conexi�n de confianza mediante outra chave xa certificada."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr "A sinatura non � correcta. Ten sentido borrala do chaveiro."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Esta � unha sinatura que liga o ID de usuario � chave. Normalmente\n"
+#~ "non � unha boa idea borrar unha sinatura como esta. De feito,\n"
+#~ "GnuPG pode non ser capaz de usar m�is esta chave. As� que faga isto\n"
+#~ "s� se esta auto-sinatura non � correcta por algun motivo e hai\n"
+#~ "unha segunda � s�a disposici�n."
+
+#~ 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 ""
+#~ "Cambia-las preferencias de t�dolos IDs de usuario (ou s� dos "
+#~ "seleccionados)\n"
+#~ "� lista actual de preferencias. A marca de tempo de t�dalas auto-"
+#~ "sinaturas\n"
+#~ "afectadas ha avanzar un segundo.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr ""
+#~ "Por favor, repita o �ltimo contrasinal, para estar seguro do que tecleou."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Introduza o nome do ficheiro ao que corresponde a sinatura"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Conteste \"si\" se � correcto sobrescribi-lo ficheiro"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Por favor, introduza un novo nome de ficheiro. Se s� preme ENTER, hase\n"
+#~ "emprega-lo ficheiro por defecto (que se amosa entre corchetes)."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Deber�a especificar un motivo para o certificado. Dependendo do contexto\n"
+#~ "pode escoller desta lista:\n"
+#~ "  \"Descobreuse a chave\"\n"
+#~ "     Empr�gueo se ten motivos para crer que algunha persoa non "
+#~ "autorizada\n"
+#~ "     obtivo acceso � s�a chave secreta.\n"
+#~ "  \"A chave � obsoleta\"\n"
+#~ "     Empr�gueo se cambiou esta chave cunha m�is recente.\n"
+#~ "  \"Xa non se emprega a chave\"\n"
+#~ "     Empr�gueo se retirou esta chave.\n"
+#~ "  \"O ID de usuario xa non � v�lido\"\n"
+#~ "     Empr�gueo para indicar que o ID de usuario xa non se deber�a "
+#~ "empregar;\n"
+#~ "     adoita empregarse para marcar un enderezo de correo non v�lido.\n"
+
+#~ 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 ""
+#~ "Se quere, pode introducir un texto que describa por que emite este\n"
+#~ "certificado de revocaci�n. Por favor, mante�a este texto breve.\n"
+#~ "Unha li�a en branco remata o texto.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "non se pode po�er datos de notaci�n nas sinaturas v3 (estilo PGP 2.x)\n"
@@ -8424,10 +8680,6 @@ msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 #~ msgstr "Introduza o ID de usuario: "
 
 #, fuzzy
-#~ msgid "Enter PIN: "
-#~ msgstr "Introduza o ID de usuario: "
-
-#, fuzzy
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
@@ -8441,9 +8693,6 @@ msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 #~ msgid "unknown packet type"
 #~ msgstr "tipo de paquete desco�ecido"
 
-#~ msgid "unknown version"
-#~ msgstr "versi�n desco�ecida"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "algoritmo de chave p�blica desco�ecido"
 
@@ -8561,9 +8810,6 @@ msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 #~ msgid "network error"
 #~ msgstr "erro de rede"
 
-#~ msgid "not encrypted"
-#~ msgstr "non cifrado"
-
 #~ msgid "not processed"
 #~ msgstr "non procesado"
 
@@ -8906,9 +9152,6 @@ msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 #~ msgid "%08lX: We do NOT trust this key\n"
 #~ msgstr "%08lX: Esta chave NON � de confianza\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (asinar e cifrar)\n"
-
 #, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "   (%d) RSA (s� asinar)\n"
@@ -9436,9 +9679,6 @@ msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 #~ msgid "Invalid certificate revocation"
 #~ msgstr "Revocaci�n de certificado non v�lida"
 
-#~ msgid "Invalid certificate"
-#~ msgstr "Certificado non v�lido"
-
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "o rexistro de sinatura %lu[%d] apunta a un rexistro incorrecto.\n"
 
diff --git a/po/hu.po b/po/hu.po
index 5e7560ffd..d230f7ca7 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -38,51 +38,51 @@ msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hib�s MPI"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelsz�"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "rossz jelsz�"
@@ -92,21 +92,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -188,8 +188,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -268,7 +268,7 @@ msgid "Please enter the new passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -287,13 +287,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
@@ -375,8 +375,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
@@ -392,29 +392,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
@@ -526,12 +527,12 @@ msgstr "%s: kihagyva: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 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:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -602,7 +603,7 @@ msgstr "M�gsem"
 msgid "error opening `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
@@ -627,7 +628,7 @@ msgstr "Olvas�si hiba: %s.\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -854,6 +855,144 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "rossz igazol�s"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "rossz igazol�s"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "Kulcs tal�lhat�: "
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: Kulcskarik�t l�trehoztam.\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "P�nc�l: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"T�mogatott algoritmusok:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "nem titkos�tott"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Az al��r�s lej�rt: %s.\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "J� al��r�s a k�vetkez�t�l: \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Az al��r�s lej�rt: %s.\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Ez a kulcs lej�rt!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "rossz igazol�s"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "rossz igazol�s"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "rossz igazol�s"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "ismeretlen verzi�"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "Hiba a z�r� sorban!\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -975,14 +1114,14 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
@@ -1161,7 +1300,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
@@ -1278,18 +1417,18 @@ msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1332,7 +1471,7 @@ msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -1351,7 +1490,7 @@ msgstr "%s rejtjelez�st haszn�lok.\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
@@ -1377,7 +1516,7 @@ 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:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1404,18 +1543,18 @@ msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 msgid "%s encrypted data\n"
 msgstr "%s titkos�tott adat.\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "Probl�ma a titkos�tott csomag kezel�sekor!\n"
 
@@ -1569,7 +1708,7 @@ msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1585,7 +1724,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1601,27 +1740,27 @@ msgstr "|[f�jl]|al��r�s k�sz�t�se"
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
@@ -1634,11 +1773,11 @@ msgstr "kulcsok �s al��r�sok list�z�sa"
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
@@ -1674,11 +1813,11 @@ msgstr "visszavon�si igazol�s k�sz�t�se"
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
@@ -1714,11 +1853,11 @@ msgstr "bizalmi adatb�zis friss�t�se"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1729,32 +1868,32 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 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:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
@@ -1770,7 +1909,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1778,7 +1917,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1816,7 +1955,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:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1836,11 +1975,11 @@ msgstr "Rejtjelez� (cipher): "
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1848,7 +1987,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
@@ -1919,467 +2058,467 @@ msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 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:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, 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:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, 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:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, 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:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 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:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, 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:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 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:4162
+#: g10/gpg.c:4210
 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:4195
+#: g10/gpg.c:4243
 #, 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"
@@ -2392,7 +2531,7 @@ msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
 msgid "make timestamp conflicts only a warning"
 msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
@@ -2408,328 +2547,11 @@ msgstr ""
 "Szintaxis: gpg [opci�k] [f�jlok]\n"
 "Ellen�rzi az al��r�sokat az ismert, megb�zhat� kulcsok seg�ts�g�vel.\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Az �n d�nt�s�n m�lik, hogy milyen �rt�ket ad meg itt. Ezt az �rt�ket soha\n"
-"nem export�ljuk m�sok r�sz�re. Ez a bizalmak h�l�zat�hoz (web-of-trust)\n"
-"sz�ks�ges, semmi k�ze az igazol�sok h�l�zat�hoz (web-of-certificates)."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Hogy a bizalmak h�l�zat�t fel�p�ts�k, a GnuPG-nek tudnia kell, hogy\n"
-"mely kulcsok alapvet�en megb�zhat�ak - �ltal�ban ezek azok a kulcsok,\n"
-"melyek titkos kulcs�hoz hozz�f�r. V�laszoljon \"igen\"-nel, ha kulcsot\n"
-"alapvet�en megb�zhat�nak jel�li!\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Ha m�gis haszn�lni akarja ezt a kulcsot, melyben nem b�zunk,\n"
-"v�laszoljon \"igen\"-nel!"
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Adja meg a c�mzett felhaszn�l�i azonos�t�j�t!"
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"�ltal�ban nem j� �tlet ugyanazt a kulcsot haszn�lni al��r�shoz �s\n"
-"titkos�t�shoz. Ezt az algoritmust csak bizonyos ter�leteken aj�nlatos\n"
-"haszn�lni. K�rem, el�sz�r konzult�ljon a biztons�gi szak�rt�j�vel!"
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Adja meg a kulcs m�ret�t!"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "K�rem, adjon \"igen\" vagy \"nem\" v�laszt!"
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Adja meg a sz�ks�ges �rt�ket, ahogy a prompt mutatja!\n"
-"Lehets�ges ISO d�tumot is be�rni (����-HH-NN), de nem fog rendes\n"
-"hiba�zenetet kapni, hanem a rendszer megpr�b�lja az �rt�ket\n"
-"intervallumk�nt �rtelmezni."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Adja meg a kulcs tulajdonos�nak a nev�t!"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "K�rem, adjon meg egy opcion�lis, de nagyon aj�nlott e-mail c�met!"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "K�rem, adjon meg egy opcion�lis megjegyz�st!"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  n�v v�ltoztat�sa\n"
-"M  megjegyz�s v�ltoztat�sa\n"
-"E  e-mail v�ltoztat�sa\n"
-"R  kulcsgener�l�s folytat�sa\n"
-"Q  kil�p�s a kulcsgener�l�sb�l"
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr ""
-"V�laszoljon \"igen\"-nel (vagy csak \"i\"-vel), ha kezdhetj�k az alkulcs\n"
-"l�trehoz�s�t!"
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Miel�tt al��r egy felhaszn�l�i azonos�t�t egy kulcson, ellen�riznie kell,\n"
-"hogy a kulcs a felhaszn�l�i azonos�t�ban megnevezett szem�lyhez tartozik.\n"
-"M�sok sz�m�ra hasznos lehet, ha tudj�k, hogy milyen gondosan ellen�rizte\n"
-"�n ezt.\n"
-"\n"
-"\"0\" azt jelenti, hogy nem tesz az ellen�rz�s gondoss�g�ra vonatkoz�\n"
-"    kijelent�st.\n"
-"\n"
-"\"1\" azt jelenti, hogy �n hiszi, hogy a kulcs annak a szem�lynek a\n"
-"    tulajdona, aki azt �ll�tja, hogy az �v�, de �n nem tudta ezt\n"
-"    ellen�rizni, vagy egyszer�en nem ellen�rizte ezt. Ez hasznos egy\n"
-"    \"persona\" t�pus� ellen�rz�shez, mikor �n egy pszeudonim felhaszn�l�\n"
-"    kulcs�t �rja al�.\n"
-"\n"
-"\"2\" azt jelenti, hogy �n a kulcsot h�tk�znapi alaposs�ggal ellen�rizte.\n"
-"    P�ld�ul ez azt jelentheti, hogy ellen�rizte a kulcs ujjlenyomat�t, �s\n"
-"    �sszevetette a kulcson szerepl� felhaszn�l�azonos�t�t egy f�nyk�pes\n"
-"    igazolv�nnyal.\n"
-"\n"
-"\"3\" azt jelenti, hogy alaposan ellen�rizte a kulcsot. P�ld�ul ez azt\n"
-"    jelentheti, hogy a kulcs ujjlenyomat�t a tulajdonossal szem�lyesen\n"
-"    tal�lkozva ellen�rizte, egy nehezen hamis�that�, f�nyk�pes "
-"igazolv�nnyal\n"
-"    (mint az �tlev�l) meggy�z�d�tt arr�l, hogy a szem�ly neve egyezik a\n"
-"    kulcson lev�vel, �s v�g�l (e-mail v�lt�ssal) ellen�rizte, hogy a "
-"kulcson\n"
-"    szerepl� e-mail c�m a kulcs tulajdonos�hoz tartozik.\n"
-"\n"
-"A 2-es �s 3-as szintekhez adott p�ld�k *csak* p�ld�k. V�gs� soron �n d�nti\n"
-"el, hogy mit jelentenek �nnek a \"h�tk�znapi\" �s \"alapos\" kifejez�sek,\n"
-"amikor m�sok kulcs�t al��rja.\n"
-"\n"
-"Ha nem tudja, hogy mit v�laszoljon, �rjon \"0\"-t!"
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr ""
-"V�laszoljon \"igen\"-nel, ha az �SSZES felhaszn�l�azonos�t�t al� akarja �rni!"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"V�laszoljon \"igen\"-nel, ha val�ban t�r�lni akarja ezt a "
-"felhaszn�l�azonos�t�t!\n"
-"Minden igazol�s t�rl�dik vele egy�tt!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "V�laszoljon \"igen\"-nel, ha az alkulcs t�r�lhet�."
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Ez egy �rv�nyes al��r�s a kulcson. Norm�l esetben nincs �rtelme\n"
-"t�r�lni, mert fontos lehet ahhoz, hogy �rv�nyes�tse ezt a kulcsot,\n"
-"vagy egy m�sikat, melyet ezzel a kulccsal igazolnak."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Ezt az al��r�st nem tudom ellen�rizni, mert nincs meg a hozz� tartoz�\n"
-"kulcs. Aj�nlatos lenne elhalasztani a t�rl�st addig, am�g meg nem tudja,\n"
-"hogy melyik kulcsot haszn�lt�k, mert ez az al��r� kulcs bizalmi\n"
-"kapcsolatot hozhat l�tre egy m�r hiteles�tett kulcson kereszt�l."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "Ez az al��r�s nem �rv�nyes. �rtelmetlen elt�vol�tani a kulcskarik�r�l."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Ez egy olyan al��r�s, amely �sszek�ti a felhaszn�l�azonos�t�t\n"
-"a kulccsal. �ltal�ban nem j� �tlet egy ilyen al��r�st elt�vol�tani.\n"
-"Az is lehets�ges, hogy a GnuPG t�bb� nem tudja haszn�lni ezt\n"
-"a kulcsot. Csak akkor tegye ezt, ha valami okb�l ez az �nal��r�s nem\n"
-"�rv�nyes, �s rendelkez�sre �ll egy m�sik!"
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Lecser�li az �sszes felhaszn�l�azonos�t�hoz (vagy csak a kijel�ltekhez)\n"
-"tartoz� preferenci�kat az aktu�lis preferenci�kra. Minden �rintett\n"
-"�nal��r�s id�pontj�t egy m�sodperccel n�veli.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "K�rem, ism�telje meg az el�z� jelsz�t ellen�rz�sk�ppen!"
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Adja meg az �llom�ny nev�t, melyhez az al��r�s tartozik!"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "V�laszoljon \"igen\"-nel, ha fel�l�rhat� az �llom�ny!"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"K�rem, adjon meg egy �j f�jlnevet! Ha RETURN-t/ENTER-t nyom, akkor\n"
-"a sz�gletes z�r�jelben lev� alap�rtelmezett nevet haszn�lom."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Aj�nlatos megadni a visszavon�s ok�t. A helyzett�l f�gg�en v�lasszon\n"
-"a k�vetkez� list�b�l:\n"
-"  \"A kulcs kompromitt�l�dott.\"\n"
-"      Haszn�lja ezt akkor, ha oka van azt hinni, hogy titkos kulcsa\n"
-"      illet�ktelen kezekbe ker�lt!\n"
-"  \"A kulcsot lecser�lt�k.\"\n"
-"      Haszn�lja ezt akkor, ha a kulcsot lecser�lte egy �jabbra!\n"
-"  \"A kulcs m�r nem haszn�latos.\"\n"
-"      Haszn�lja ezt akkor, ha m�r nem haszn�lja a kulcsot!\n"
-"  \"A felhaszn�l�azonos�t� m�r nem �rv�nyes.\"\n"
-"      Haszn�lja ezt akkor, ha azt �ll�tja, hogy a felhaszn�l�azonos�t�\n"
-"      m�r nem haszn�latos! �ltal�ban �rv�nytelen e-mail c�met jelent.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Ha akarja, megadhat egy sz�veget, melyben megindokolja, hogy mi�rt\n"
-"adta ki ezt a visszavon� igazol�st. K�rem, fogalmazzon t�m�ren!\n"
-"Egy �res sor jelzi a sz�veg v�g�t.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Nem �ll rendelkez�sre seg�ts�g."
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
@@ -2924,13 +2746,13 @@ msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
@@ -3021,7 +2843,7 @@ msgstr ""
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
@@ -3506,8 +3328,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
@@ -3516,20 +3338,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 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:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
@@ -3546,7 +3368,7 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
@@ -3912,93 +3734,93 @@ msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 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:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Jel�l�s: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4006,19 +3828,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:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4026,7 +3848,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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4036,75 +3858,75 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, 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
+#: g10/keyedit.c:3253
 #, 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
+#: g10/keyedit.c:3261
 #, 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
+#: g10/keyedit.c:3262
 #, 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:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4114,199 +3936,199 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 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:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 #, 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:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 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:3540
+#: g10/keyedit.c:3541
 #, 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:3544
+#: g10/keyedit.c:3545
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, 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:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 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:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 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:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, 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:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, 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:5004
+#: g10/keyedit.c:5005
 #, 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:5099
+#: g10/keyedit.c:5100
 #, 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"
@@ -4349,12 +4171,12 @@ msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
@@ -4382,109 +4204,119 @@ msgstr "adat titkos�t�sa"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsm�retet szeretne? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4500,7 +4332,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4516,40 +4348,40 @@ msgstr ""
 "      <n>m = az al��r�s n h�napig �rv�nyes\n"
 "      <n>y = az al��r�s n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4557,12 +4389,12 @@ msgstr ""
 "Az �n rendszere nem tud megjelen�teni 2038 ut�ni d�tumokat.\n"
 "Azonban kezelni helyesen tudja �ket eg�szen 2106-ig.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4579,44 +4411,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�n a(z) %s karakterk�dol�st haszn�lja.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4627,7 +4459,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 
@@ -4642,24 +4474,24 @@ msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4667,12 +4499,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4684,7 +4516,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4696,50 +4528,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:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, 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:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 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:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4749,46 +4581,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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, 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:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, 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:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, 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:3917
+#: g10/keygen.c:3931
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
@@ -5097,194 +4929,194 @@ msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 msgid "public key is %s\n"
 msgstr "Nyilv�nos kulcs: %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkos�tott adatot felt�telezek.\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "Visszafejt�s rendben.\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 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:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti f�jln�v: '%.*s'.\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 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:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, 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:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, 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:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
@@ -5303,83 +5135,90 @@ msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr ""
+"%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
+"a c�mzett preferenci�ival.\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "nem megval�s�tott rejtjelez� algoritmus"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = tov�bbi inform�ci�kat k�rek\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opci�: \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
@@ -6161,12 +6000,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6174,16 +6013,16 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
@@ -6512,7 +6351,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
@@ -6540,32 +6379,32 @@ msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
@@ -6704,12 +6543,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6770,11 +6609,11 @@ msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6886,12 +6725,12 @@ msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
@@ -6900,7 +6739,7 @@ msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
@@ -6963,22 +6802,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6987,11 +6826,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -7032,8 +6871,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
@@ -7166,61 +7005,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, 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:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "%c%lu preferencia k�tszer szerepel!\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "Visszavon� igazol�s l�trehozva.\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "rossz igazol�s"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7235,7 +7074,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7357,6 +7196,111 @@ msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (csak al��r�s)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) RSA (csak titkos�t�s)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (al��r�s �s titkos�t�s)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (csak al��r�s)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (csak titkos�t�s)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(Nincs le�r�s.)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "E-mail c�m: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "�rja be az �j �llom�nynevet"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7390,195 +7334,195 @@ 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:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "alap�rt. kulcs haszn. alap�rt. c�mzettk�nt"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "3-as verzi�j� al��r�sok er�ltet�se"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "mindig haszn�ljon MDC-t titkos�t�skor"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "k�tegelt m�d: soha nem k�rdez"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "titkoskulcs-karika hozz�ad�sa a list�hoz"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|N. sorsz�m� t�m�r�t� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7589,36 +7533,36 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, 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:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7725,7 +7669,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7744,31 +7688,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "               azaz \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -8228,6 +8172,307 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Az �n d�nt�s�n m�lik, hogy milyen �rt�ket ad meg itt. Ezt az �rt�ket "
+#~ "soha\n"
+#~ "nem export�ljuk m�sok r�sz�re. Ez a bizalmak h�l�zat�hoz (web-of-trust)\n"
+#~ "sz�ks�ges, semmi k�ze az igazol�sok h�l�zat�hoz (web-of-certificates)."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Hogy a bizalmak h�l�zat�t fel�p�ts�k, a GnuPG-nek tudnia kell, hogy\n"
+#~ "mely kulcsok alapvet�en megb�zhat�ak - �ltal�ban ezek azok a kulcsok,\n"
+#~ "melyek titkos kulcs�hoz hozz�f�r. V�laszoljon \"igen\"-nel, ha kulcsot\n"
+#~ "alapvet�en megb�zhat�nak jel�li!\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Ha m�gis haszn�lni akarja ezt a kulcsot, melyben nem b�zunk,\n"
+#~ "v�laszoljon \"igen\"-nel!"
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "Adja meg a c�mzett felhaszn�l�i azonos�t�j�t!"
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "�ltal�ban nem j� �tlet ugyanazt a kulcsot haszn�lni al��r�shoz �s\n"
+#~ "titkos�t�shoz. Ezt az algoritmust csak bizonyos ter�leteken aj�nlatos\n"
+#~ "haszn�lni. K�rem, el�sz�r konzult�ljon a biztons�gi szak�rt�j�vel!"
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Adja meg a kulcs m�ret�t!"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "K�rem, adjon \"igen\" vagy \"nem\" v�laszt!"
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Adja meg a sz�ks�ges �rt�ket, ahogy a prompt mutatja!\n"
+#~ "Lehets�ges ISO d�tumot is be�rni (����-HH-NN), de nem fog rendes\n"
+#~ "hiba�zenetet kapni, hanem a rendszer megpr�b�lja az �rt�ket\n"
+#~ "intervallumk�nt �rtelmezni."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Adja meg a kulcs tulajdonos�nak a nev�t!"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "K�rem, adjon meg egy opcion�lis, de nagyon aj�nlott e-mail c�met!"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "K�rem, adjon meg egy opcion�lis megjegyz�st!"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  n�v v�ltoztat�sa\n"
+#~ "M  megjegyz�s v�ltoztat�sa\n"
+#~ "E  e-mail v�ltoztat�sa\n"
+#~ "R  kulcsgener�l�s folytat�sa\n"
+#~ "Q  kil�p�s a kulcsgener�l�sb�l"
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr ""
+#~ "V�laszoljon \"igen\"-nel (vagy csak \"i\"-vel), ha kezdhetj�k az alkulcs\n"
+#~ "l�trehoz�s�t!"
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Miel�tt al��r egy felhaszn�l�i azonos�t�t egy kulcson, ellen�riznie "
+#~ "kell,\n"
+#~ "hogy a kulcs a felhaszn�l�i azonos�t�ban megnevezett szem�lyhez "
+#~ "tartozik.\n"
+#~ "M�sok sz�m�ra hasznos lehet, ha tudj�k, hogy milyen gondosan ellen�rizte\n"
+#~ "�n ezt.\n"
+#~ "\n"
+#~ "\"0\" azt jelenti, hogy nem tesz az ellen�rz�s gondoss�g�ra vonatkoz�\n"
+#~ "    kijelent�st.\n"
+#~ "\n"
+#~ "\"1\" azt jelenti, hogy �n hiszi, hogy a kulcs annak a szem�lynek a\n"
+#~ "    tulajdona, aki azt �ll�tja, hogy az �v�, de �n nem tudta ezt\n"
+#~ "    ellen�rizni, vagy egyszer�en nem ellen�rizte ezt. Ez hasznos egy\n"
+#~ "    \"persona\" t�pus� ellen�rz�shez, mikor �n egy pszeudonim "
+#~ "felhaszn�l�\n"
+#~ "    kulcs�t �rja al�.\n"
+#~ "\n"
+#~ "\"2\" azt jelenti, hogy �n a kulcsot h�tk�znapi alaposs�ggal "
+#~ "ellen�rizte.\n"
+#~ "    P�ld�ul ez azt jelentheti, hogy ellen�rizte a kulcs ujjlenyomat�t, "
+#~ "�s\n"
+#~ "    �sszevetette a kulcson szerepl� felhaszn�l�azonos�t�t egy f�nyk�pes\n"
+#~ "    igazolv�nnyal.\n"
+#~ "\n"
+#~ "\"3\" azt jelenti, hogy alaposan ellen�rizte a kulcsot. P�ld�ul ez azt\n"
+#~ "    jelentheti, hogy a kulcs ujjlenyomat�t a tulajdonossal szem�lyesen\n"
+#~ "    tal�lkozva ellen�rizte, egy nehezen hamis�that�, f�nyk�pes "
+#~ "igazolv�nnyal\n"
+#~ "    (mint az �tlev�l) meggy�z�d�tt arr�l, hogy a szem�ly neve egyezik a\n"
+#~ "    kulcson lev�vel, �s v�g�l (e-mail v�lt�ssal) ellen�rizte, hogy a "
+#~ "kulcson\n"
+#~ "    szerepl� e-mail c�m a kulcs tulajdonos�hoz tartozik.\n"
+#~ "\n"
+#~ "A 2-es �s 3-as szintekhez adott p�ld�k *csak* p�ld�k. V�gs� soron �n "
+#~ "d�nti\n"
+#~ "el, hogy mit jelentenek �nnek a \"h�tk�znapi\" �s \"alapos\" "
+#~ "kifejez�sek,\n"
+#~ "amikor m�sok kulcs�t al��rja.\n"
+#~ "\n"
+#~ "Ha nem tudja, hogy mit v�laszoljon, �rjon \"0\"-t!"
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr ""
+#~ "V�laszoljon \"igen\"-nel, ha az �SSZES felhaszn�l�azonos�t�t al� akarja "
+#~ "�rni!"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "V�laszoljon \"igen\"-nel, ha val�ban t�r�lni akarja ezt a "
+#~ "felhaszn�l�azonos�t�t!\n"
+#~ "Minden igazol�s t�rl�dik vele egy�tt!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "V�laszoljon \"igen\"-nel, ha az alkulcs t�r�lhet�."
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Ez egy �rv�nyes al��r�s a kulcson. Norm�l esetben nincs �rtelme\n"
+#~ "t�r�lni, mert fontos lehet ahhoz, hogy �rv�nyes�tse ezt a kulcsot,\n"
+#~ "vagy egy m�sikat, melyet ezzel a kulccsal igazolnak."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Ezt az al��r�st nem tudom ellen�rizni, mert nincs meg a hozz� tartoz�\n"
+#~ "kulcs. Aj�nlatos lenne elhalasztani a t�rl�st addig, am�g meg nem tudja,\n"
+#~ "hogy melyik kulcsot haszn�lt�k, mert ez az al��r� kulcs bizalmi\n"
+#~ "kapcsolatot hozhat l�tre egy m�r hiteles�tett kulcson kereszt�l."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "Ez az al��r�s nem �rv�nyes. �rtelmetlen elt�vol�tani a kulcskarik�r�l."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Ez egy olyan al��r�s, amely �sszek�ti a felhaszn�l�azonos�t�t\n"
+#~ "a kulccsal. �ltal�ban nem j� �tlet egy ilyen al��r�st elt�vol�tani.\n"
+#~ "Az is lehets�ges, hogy a GnuPG t�bb� nem tudja haszn�lni ezt\n"
+#~ "a kulcsot. Csak akkor tegye ezt, ha valami okb�l ez az �nal��r�s nem\n"
+#~ "�rv�nyes, �s rendelkez�sre �ll egy m�sik!"
+
+#~ 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 ""
+#~ "Lecser�li az �sszes felhaszn�l�azonos�t�hoz (vagy csak a kijel�ltekhez)\n"
+#~ "tartoz� preferenci�kat az aktu�lis preferenci�kra. Minden �rintett\n"
+#~ "�nal��r�s id�pontj�t egy m�sodperccel n�veli.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "K�rem, ism�telje meg az el�z� jelsz�t ellen�rz�sk�ppen!"
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Adja meg az �llom�ny nev�t, melyhez az al��r�s tartozik!"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "V�laszoljon \"igen\"-nel, ha fel�l�rhat� az �llom�ny!"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "K�rem, adjon meg egy �j f�jlnevet! Ha RETURN-t/ENTER-t nyom, akkor\n"
+#~ "a sz�gletes z�r�jelben lev� alap�rtelmezett nevet haszn�lom."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Aj�nlatos megadni a visszavon�s ok�t. A helyzett�l f�gg�en v�lasszon\n"
+#~ "a k�vetkez� list�b�l:\n"
+#~ "  \"A kulcs kompromitt�l�dott.\"\n"
+#~ "      Haszn�lja ezt akkor, ha oka van azt hinni, hogy titkos kulcsa\n"
+#~ "      illet�ktelen kezekbe ker�lt!\n"
+#~ "  \"A kulcsot lecser�lt�k.\"\n"
+#~ "      Haszn�lja ezt akkor, ha a kulcsot lecser�lte egy �jabbra!\n"
+#~ "  \"A kulcs m�r nem haszn�latos.\"\n"
+#~ "      Haszn�lja ezt akkor, ha m�r nem haszn�lja a kulcsot!\n"
+#~ "  \"A felhaszn�l�azonos�t� m�r nem �rv�nyes.\"\n"
+#~ "      Haszn�lja ezt akkor, ha azt �ll�tja, hogy a felhaszn�l�azonos�t�\n"
+#~ "      m�r nem haszn�latos! �ltal�ban �rv�nytelen e-mail c�met jelent.\n"
+
+#~ 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 ""
+#~ "Ha akarja, megadhat egy sz�veget, melyben megindokolja, hogy mi�rt\n"
+#~ "adta ki ezt a visszavon� igazol�st. K�rem, fogalmazzon t�m�ren!\n"
+#~ "Egy �res sor jelzi a sz�veg v�g�t.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
 
@@ -8382,9 +8627,6 @@ msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 #~ msgid "unknown packet type"
 #~ msgstr "ismeretlen csomagt�pus"
 
-#~ msgid "unknown version"
-#~ msgstr "ismeretlen verzi�"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "ismeretlen nyilv�nos kulcs� algoritmus"
 
@@ -8499,9 +8741,6 @@ msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 #~ msgid "network error"
 #~ msgstr "h�l�zati hiba"
 
-#~ msgid "not encrypted"
-#~ msgstr "nem titkos�tott"
-
 #~ msgid "not processed"
 #~ msgstr "nem feldolgozott"
 
@@ -8845,9 +9084,6 @@ msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 #~ msgid "%08lX: We do NOT trust this key\n"
 #~ msgstr "%08lX: Ebben a kulcsban NEM b�zunk.\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (al��r�s �s titkos�t�s)\n"
-
 #, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "   (%d) RSA (csak al��r�s)\n"
diff --git a/po/id.po b/po/id.po
index e7ca0c424..93a0d8854 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -40,51 +40,51 @@ msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase yang buruk"
@@ -94,21 +94,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -190,8 +190,8 @@ msgstr "passphrase tidak diulang dengan benar; coba lagi"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -270,7 +270,7 @@ msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -289,13 +289,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detil"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
@@ -377,8 +377,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Laporkan bug ke <[email protected]>.\n"
@@ -394,29 +394,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
@@ -528,12 +529,12 @@ msgstr "%s: dilewati: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -604,7 +605,7 @@ msgstr "Batal"
 msgid "error opening `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
@@ -629,7 +630,7 @@ msgstr "kesalahan pembacaan: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -856,6 +857,144 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "sertifikat yang buruk"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "sertifikat yang buruk"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "Kunci tersedia di:"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: keyring tercipta\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "armor: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Algoritma yang didukung:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "tidak dienkripsi"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "verifikasi signature tidak diabaikan\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Signature kadaluwarsa %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Signature baik dari \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "algoritma hash tidak valid `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Signature kadaluwarsa %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Kunci ini telah berakhir!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "sertifikat yang buruk"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "sertifikat yang buruk"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "sertifikat yang buruk"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "versi tidak dikenal"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Tidak tersedia bantuan untuk `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "kesalahan dalam garis trailer\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -978,14 +1117,14 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
@@ -1164,7 +1303,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
@@ -1281,18 +1420,18 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1335,7 +1474,7 @@ msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -1354,7 +1493,7 @@ msgstr "menggunakan cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
@@ -1382,7 +1521,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1409,18 +1548,18 @@ msgstr "%s/%s dienkripsi untuk: %s\n"
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "masalah menangani paket terenkripsi\n"
 
@@ -1572,7 +1711,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
@@ -1587,7 +1726,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1603,27 +1742,27 @@ msgstr "|[file]|buat signature"
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "tampilkan kunci"
 
@@ -1636,11 +1775,11 @@ msgstr "tampilkan kunci dan signature"
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
@@ -1676,11 +1815,11 @@ msgstr "buat sertifikat revokasi"
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
@@ -1716,11 +1855,11 @@ msgstr "perbarui database trust"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1731,32 +1870,32 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
@@ -1772,7 +1911,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1780,7 +1919,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1818,7 +1957,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1838,11 +1977,11 @@ msgstr "Cipher: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1850,7 +1989,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
@@ -1921,475 +2060,475 @@ msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -2402,7 +2541,7 @@ msgstr "mengambil kunci ini dari keyring"
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
@@ -2418,334 +2557,11 @@ msgstr ""
 "Sintaks: gpg [options] [files]\n"
 "Periksa signature terhadap kunci terpercaya\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Terserah anda untuk memberi nilai baru di sini; nilai ini tidak akan "
-"diekspor\n"
-"ke pihak ketiga. Kami perlu untuk mengimplementasikan web-of-trust; tidak "
-"ada\n"
-"kaitan dengan (membuat secara implisit) web-of-certificates."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Untuk membuat Web-of-Trust, GnuPG perlu tahu kunci mana yang\n"
-"sangat dipercaya - mereka biasanya adalah kunci yang anda punya\n"
-"akses ke kunci rahasia.  Jawab \"yes\" untuk menset kunci ini ke\n"
-"sangat dipercaya\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "Jika anda ingin menggunakan kunci tidak terpercaya ini, jawab \"ya\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Masukkan ID user penerima pesan."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"Secara umum bukan ide baik untuk menggunakan kunci yang sama untuk menandai "
-"dan\n"
-"mengenkripsi.  Algoritma ini seharusnya digunakan dalam domain tertentu.\n"
-"Silakan berkonsultasi dulu dengan ahli keamanan anda."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Masukkan ukuran kunci"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Jawab \"ya\" atau \"tidak\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Masukkan nilai yang diperlukan seperti pada prompt.\n"
-"Dapat digunakan format (YYYY-MM-DD) untuk mengisi tanggal ISO tetapi anda\n"
-"tidak akan mendapat respon kesalahan yang baik - sebaiknya sistem akan\n"
-"berusaha menginterprestasi nilai yang diberikan sebagai sebuah interval."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Masukkan nama pemegang kunci"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "silakan masukkan alamat email (pilihan namun sangat dianjurkan)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Silakan masukkan komentar tambahan"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  untuk merubah nama.\n"
-"K  untuk merubah komentar.\n"
-"E  untuk merubah alamat email.\n"
-"O  untuk melanjutkan dengan pembuatan kunci.\n"
-"K  untuk menghentikan pembuatan kunci."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Jawab \"ya\" (atau \"y\") jika telah siap membuat subkey."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Ketika anda menandai user ID pada kunci, anda perlu memverifikasi bahwa "
-"kunci\n"
-"milik orang yang disebut dalam user ID.  Ini penting bagi orang lain untuk "
-"tahu\n"
-"seberapa cermat anda memverifikasi ini.\n"
-"\n"
-"\"0\" berarti anda tidak melakukan klaim tentang betapa cermat anda "
-"memverifikasi    kunci.\n"
-"\n"
-"\"1\" berarti anda percaya bahwa kunci dimiliki oleh orang yang mengklaim "
-"memilikinya\n"
-"    namun anda tidak dapat, atau tidak memverifikasi kunci sama sekali.  Hal "
-"ini bergunabagi\n"
-"    verifikasi \"persona\", yaitu anda menandai kunci user pseudonymous\n"
-"\n"
-"\"2\" berarti anda melakukan verifikasi kasual atas kunci.  Sebagai contoh, "
-"halini dapat\n"
-"    berarti bahwa anda memverifikasi fingerprint kunci dan memeriksa user ID "
-"pada kunci\n"
-"    dengan photo ID.\n"
-"\n"
-"\"3\" berarti anda melakukan verifikasi ekstensif atas kunci.  Sebagai "
-"contoh, hal ini\n"
-"    dapat berarti anda memverifikasi fingerprint kunci dengan pemilik kunci\n"
-"    secara personal, dan anda memeriksa, dengan menggunakan dokumen yang "
-"sulit dipalsukan yang memiliki\n"
-"    photo ID (seperti paspor) bahwa nama pemilik kunci cocok dengan\n"
-"    nama user ID kunci, dan bahwa anda telah memverifikasi (dengan "
-"pertukaran\n"
-"    email) bahwa alamat email pada kunci milik pemilik kunci.\n"
-"\n"
-"Contoh-contoh pada level 2 dan 3 hanyalah contoh.\n"
-"Pada akhirnya, terserah anda untuk memutuskan apa arti  \"kasual\" dan "
-"\"ekstensif\"\n"
-"bagi anda ketika menandai kunci lain.\n"
-"\n"
-"Jika anda tidak tahu jawaban yang tepat, jawab \"0\"."
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Jawab \"ya\" jika anda ingin menandai seluruh ID user"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Jawab \"ya\" jika anda benar-benar ingin menghapus ID user ini.\n"
-"Seluruh sertifikat juga akan hilang!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Jawab \"ya\" jika ingin menghapus subkey"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Ini adalah signature valid untuk kunci; anda normalnya tdk ingin menghapus\n"
-"signature ini karena mungkin penting membangun koneksi trust ke kunci atau\n"
-"ke kunci tersertifikasi lain dengan kunci ini."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Signature ini tidak dapat diperiksa karena anda tidak memiliki kunci\n"
-"korespondennya. Anda perlu menunda penghapusannya hingga anda tahu\n"
-"kunci yang digunakan karena kunci penanda ini mungkin membangun suatu\n"
-"koneksi trust melalui kunci yang telah tersertifikasi lain."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-"Signature tidak valid.  Adalah hal yang masuk akal untuk menghapusnya dari\n"
-"keyring anda"
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Ini adalah signature yang menghubungkan ID pemakai ke kunci. Biasanya\n"
-"bukan ide yang baik untuk menghapus signature semacam itu. Umumnya\n"
-"GnuPG tidak akan dapat menggunakan kunci ini lagi. Sehingga lakukan hal\n"
-"ini bila self-signature untuk beberapa alasan tidak valid dan\n"
-"tersedia yang kedua."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Rubah preferensi seluruh user ID (atau hanya yang terpilih)\n"
-"ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
-"yang terpengaruh akan bertambah satu detik.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-"Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Beri nama file tempat berlakunya signature"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Jawab \"ya\" jika tidak apa-apa menimpa file"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Silakan masukan nama file baru. Jika anda hanya menekan RETURN nama\n"
-"file baku (yang diapit tanda kurung) akan dipakai."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Anda harus menspesifikasikan alasan pembatalan. Semua ini tergantung\n"
-"konteks, anda dapat memilih dari daftar berikut:\n"
-" \"Key has been compromised\"\n"
-"      Gunakan ini jika anda punya alasan untuk percaya bahwa orang yang "
-"tidak berhak\n"
-"      memiliki akses ke kunci pribadi anda.\n"
-"  \"Key is superseded\"\n"
-"      Gunakan ini bila anda mengganti kunci anda dengan yang baru.\n"
-"  \"Key is no longer used\"\n"
-"      Gunakan ini bila anda telah mempensiunkan kunci ini.\n"
-"  \"User ID is no longer valid\"\n"
-"      Gunakan ini untuk menyatakan user ID tidak boleh digunakan lagi;\n"
-"      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
-"lagi.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Jika anda suka, anda dapat memasukkan teks menjelaskan mengapa anda\n"
-"mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n"
-"Baris kosong mengakhiri teks.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Tidak tersedia bantuan"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
@@ -2940,13 +2756,13 @@ msgstr "kunci %08lX: kunci baru - dilewati\n"
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
@@ -3036,7 +2852,7 @@ msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
@@ -3523,8 +3339,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -3533,20 +3349,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
@@ -3563,7 +3379,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
@@ -3929,93 +3745,93 @@ msgstr "gagal perbarui rahasia: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2726
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4023,19 +3839,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4043,7 +3859,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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4053,75 +3869,75 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4131,202 +3947,202 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 #, 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:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, 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"
@@ -4369,12 +4185,12 @@ msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
@@ -4402,109 +4218,119 @@ msgstr "enkripsi data"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4520,7 +4346,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4536,40 +4362,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4577,12 +4403,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4598,44 +4424,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4645,7 +4471,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
@@ -4660,23 +4486,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4684,12 +4510,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4702,7 +4528,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4714,50 +4540,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4767,45 +4593,45 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, 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:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, 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:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -5110,192 +4936,192 @@ msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -5314,81 +5140,86 @@ msgstr "trustdb: read failed (n=%d): %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritma cipher belum diimplementasikan"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
@@ -6164,29 +5995,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, 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:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -6514,7 +6345,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
@@ -6542,32 +6373,32 @@ msgstr "lakukanlah --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -6706,12 +6537,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6772,11 +6603,11 @@ msgstr "Pengiriman keyserver gagal: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6888,12 +6719,12 @@ msgstr "%s signature, algoritma digest %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -6902,7 +6733,7 @@ msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "membaca pilihan dari `%s'\n"
@@ -6965,22 +6796,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6989,11 +6820,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "bantuan"
@@ -7034,8 +6865,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
@@ -7168,61 +6999,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "buat sertifikat revokasi"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikasi signature"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7237,7 +7068,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7358,6 +7189,112 @@ msgstr "kesalahan menulis keyring `%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "  (%d) RSA (hanya menandai)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "  (%d) RSA (hanya enkripsi)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (tandai dan enkripsi)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "  (%d) DSA (hanya menandai)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "  (%d) RSA (hanya enkripsi)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(Tidak diberikan deskripsi)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "algoritma hash tidak valid `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Alamat email: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Masukkan user ID.  Akhiri dengan baris kosong: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Masukkan nama file baru"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr ""
+"Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7391,195 +7328,195 @@ msgstr "preferensi %c%lu ganda \n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "tampilkan kunci rahasia"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ciptakan output ascii"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7590,36 +7527,36 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7726,7 +7663,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7745,31 +7682,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Signature kadaluwarsa %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Signature baik dari \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "              alias \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -8229,6 +8166,310 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Terserah anda untuk memberi nilai baru di sini; nilai ini tidak akan "
+#~ "diekspor\n"
+#~ "ke pihak ketiga. Kami perlu untuk mengimplementasikan web-of-trust; tidak "
+#~ "ada\n"
+#~ "kaitan dengan (membuat secara implisit) web-of-certificates."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Untuk membuat Web-of-Trust, GnuPG perlu tahu kunci mana yang\n"
+#~ "sangat dipercaya - mereka biasanya adalah kunci yang anda punya\n"
+#~ "akses ke kunci rahasia.  Jawab \"yes\" untuk menset kunci ini ke\n"
+#~ "sangat dipercaya\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Jika anda ingin menggunakan kunci tidak terpercaya ini, jawab \"ya\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "Masukkan ID user penerima pesan."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "Secara umum bukan ide baik untuk menggunakan kunci yang sama untuk "
+#~ "menandai dan\n"
+#~ "mengenkripsi.  Algoritma ini seharusnya digunakan dalam domain tertentu.\n"
+#~ "Silakan berkonsultasi dulu dengan ahli keamanan anda."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Masukkan ukuran kunci"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Jawab \"ya\" atau \"tidak\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Masukkan nilai yang diperlukan seperti pada prompt.\n"
+#~ "Dapat digunakan format (YYYY-MM-DD) untuk mengisi tanggal ISO tetapi "
+#~ "anda\n"
+#~ "tidak akan mendapat respon kesalahan yang baik - sebaiknya sistem akan\n"
+#~ "berusaha menginterprestasi nilai yang diberikan sebagai sebuah interval."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Masukkan nama pemegang kunci"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "silakan masukkan alamat email (pilihan namun sangat dianjurkan)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Silakan masukkan komentar tambahan"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  untuk merubah nama.\n"
+#~ "K  untuk merubah komentar.\n"
+#~ "E  untuk merubah alamat email.\n"
+#~ "O  untuk melanjutkan dengan pembuatan kunci.\n"
+#~ "K  untuk menghentikan pembuatan kunci."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Jawab \"ya\" (atau \"y\") jika telah siap membuat subkey."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Ketika anda menandai user ID pada kunci, anda perlu memverifikasi bahwa "
+#~ "kunci\n"
+#~ "milik orang yang disebut dalam user ID.  Ini penting bagi orang lain "
+#~ "untuk tahu\n"
+#~ "seberapa cermat anda memverifikasi ini.\n"
+#~ "\n"
+#~ "\"0\" berarti anda tidak melakukan klaim tentang betapa cermat anda "
+#~ "memverifikasi    kunci.\n"
+#~ "\n"
+#~ "\"1\" berarti anda percaya bahwa kunci dimiliki oleh orang yang mengklaim "
+#~ "memilikinya\n"
+#~ "    namun anda tidak dapat, atau tidak memverifikasi kunci sama sekali.  "
+#~ "Hal ini bergunabagi\n"
+#~ "    verifikasi \"persona\", yaitu anda menandai kunci user pseudonymous\n"
+#~ "\n"
+#~ "\"2\" berarti anda melakukan verifikasi kasual atas kunci.  Sebagai "
+#~ "contoh, halini dapat\n"
+#~ "    berarti bahwa anda memverifikasi fingerprint kunci dan memeriksa user "
+#~ "ID pada kunci\n"
+#~ "    dengan photo ID.\n"
+#~ "\n"
+#~ "\"3\" berarti anda melakukan verifikasi ekstensif atas kunci.  Sebagai "
+#~ "contoh, hal ini\n"
+#~ "    dapat berarti anda memverifikasi fingerprint kunci dengan pemilik "
+#~ "kunci\n"
+#~ "    secara personal, dan anda memeriksa, dengan menggunakan dokumen yang "
+#~ "sulit dipalsukan yang memiliki\n"
+#~ "    photo ID (seperti paspor) bahwa nama pemilik kunci cocok dengan\n"
+#~ "    nama user ID kunci, dan bahwa anda telah memverifikasi (dengan "
+#~ "pertukaran\n"
+#~ "    email) bahwa alamat email pada kunci milik pemilik kunci.\n"
+#~ "\n"
+#~ "Contoh-contoh pada level 2 dan 3 hanyalah contoh.\n"
+#~ "Pada akhirnya, terserah anda untuk memutuskan apa arti  \"kasual\" dan "
+#~ "\"ekstensif\"\n"
+#~ "bagi anda ketika menandai kunci lain.\n"
+#~ "\n"
+#~ "Jika anda tidak tahu jawaban yang tepat, jawab \"0\"."
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Jawab \"ya\" jika anda ingin menandai seluruh ID user"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Jawab \"ya\" jika anda benar-benar ingin menghapus ID user ini.\n"
+#~ "Seluruh sertifikat juga akan hilang!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Jawab \"ya\" jika ingin menghapus subkey"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Ini adalah signature valid untuk kunci; anda normalnya tdk ingin "
+#~ "menghapus\n"
+#~ "signature ini karena mungkin penting membangun koneksi trust ke kunci "
+#~ "atau\n"
+#~ "ke kunci tersertifikasi lain dengan kunci ini."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Signature ini tidak dapat diperiksa karena anda tidak memiliki kunci\n"
+#~ "korespondennya. Anda perlu menunda penghapusannya hingga anda tahu\n"
+#~ "kunci yang digunakan karena kunci penanda ini mungkin membangun suatu\n"
+#~ "koneksi trust melalui kunci yang telah tersertifikasi lain."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "Signature tidak valid.  Adalah hal yang masuk akal untuk menghapusnya "
+#~ "dari\n"
+#~ "keyring anda"
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Ini adalah signature yang menghubungkan ID pemakai ke kunci. Biasanya\n"
+#~ "bukan ide yang baik untuk menghapus signature semacam itu. Umumnya\n"
+#~ "GnuPG tidak akan dapat menggunakan kunci ini lagi. Sehingga lakukan hal\n"
+#~ "ini bila self-signature untuk beberapa alasan tidak valid dan\n"
+#~ "tersedia yang kedua."
+
+#~ 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 ""
+#~ "Rubah preferensi seluruh user ID (atau hanya yang terpilih)\n"
+#~ "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
+#~ "yang terpengaruh akan bertambah satu detik.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr ""
+#~ "Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda "
+#~ "ketikkan."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Beri nama file tempat berlakunya signature"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Jawab \"ya\" jika tidak apa-apa menimpa file"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Silakan masukan nama file baru. Jika anda hanya menekan RETURN nama\n"
+#~ "file baku (yang diapit tanda kurung) akan dipakai."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Anda harus menspesifikasikan alasan pembatalan. Semua ini tergantung\n"
+#~ "konteks, anda dapat memilih dari daftar berikut:\n"
+#~ " \"Key has been compromised\"\n"
+#~ "      Gunakan ini jika anda punya alasan untuk percaya bahwa orang yang "
+#~ "tidak berhak\n"
+#~ "      memiliki akses ke kunci pribadi anda.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Gunakan ini bila anda mengganti kunci anda dengan yang baru.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Gunakan ini bila anda telah mempensiunkan kunci ini.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Gunakan ini untuk menyatakan user ID tidak boleh digunakan lagi;\n"
+#~ "      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
+#~ "lagi.\n"
+
+#~ 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 ""
+#~ "Jika anda suka, anda dapat memasukkan teks menjelaskan mengapa anda\n"
+#~ "mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n"
+#~ "Baris kosong mengakhiri teks.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "tidak dapat menaruh notasi data ke signature v3(gaya PGP 2.x)\n"
 
@@ -8384,9 +8625,6 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 #~ msgid "unknown packet type"
 #~ msgstr "tipe paket tidak dikenal"
 
-#~ msgid "unknown version"
-#~ msgstr "versi tidak dikenal"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "algoritma pubkey tidak dikenal"
 
@@ -8501,9 +8739,6 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 #~ msgid "network error"
 #~ msgstr "kesalahan jaringan"
 
-#~ msgid "not encrypted"
-#~ msgstr "tidak dienkripsi"
-
 #~ msgid "not processed"
 #~ msgstr "tidak diproses"
 
@@ -8847,9 +9082,6 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 #~ msgid "%08lX: We do NOT trust this key\n"
 #~ msgstr "%08lX: Kita TIDAK percaya kunci ini\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (tandai dan enkripsi)\n"
-
 #, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "  (%d) RSA (hanya menandai)\n"
diff --git a/po/it.po b/po/it.po
index 3082446a9..bd52ad6b1 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -38,51 +38,51 @@ msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "riga troppo lunga\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase troppo lunga\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Carattere non valido nel nome\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI danneggiato"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase errata"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase errata"
@@ -92,21 +92,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -188,8 +188,8 @@ msgstr "passphrase non ripetuta correttamente; prova ancora"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -268,7 +268,7 @@ msgid "Please enter the new passphrase"
 msgstr "cambia la passphrase"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -287,13 +287,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolisso"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
@@ -375,8 +375,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
@@ -392,29 +392,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
@@ -526,12 +527,12 @@ msgstr "%s: saltata: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -602,7 +603,7 @@ msgstr "Cancella"
 msgid "error opening `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
@@ -627,7 +628,7 @@ msgstr "errore di lettura: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -854,6 +855,144 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "certificato danneggiato"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "certificato danneggiato"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "Chiave disponibile presso: "
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: portachiavi creato\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "armatura: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Algoritmi gestiti:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "non cifrato"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "verifica della firma soppressa\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Firma scaduta il %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Firma valida da \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "algoritmo di hash non valido `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Firma scaduta il %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Questa chiave � scaduta!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "certificato danneggiato"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "certificato danneggiato"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "certificato danneggiato"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "versione sconosciuta"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Non � disponibile un aiuto per `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "errore nella riga della coda\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -976,14 +1115,14 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
@@ -1163,7 +1302,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
@@ -1280,18 +1419,18 @@ msgstr "Comando non valido  (prova \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1334,7 +1473,7 @@ msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -1354,7 +1493,7 @@ msgstr "uso il cifrario %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
@@ -1385,7 +1524,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1416,19 +1555,19 @@ msgstr "%s/%s cifrato per: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "problema nella gestione del pacchetto cifrato\n"
 
@@ -1580,7 +1719,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1596,7 +1735,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1612,27 +1751,27 @@ msgstr "|[file]|fai una firma"
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "elenca le chiavi"
 
@@ -1645,11 +1784,11 @@ msgstr "elenca le chiavi e le firme"
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
@@ -1685,11 +1824,11 @@ msgstr "genera un certificato di revoca"
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
@@ -1725,11 +1864,11 @@ msgstr "aggiorna il database della fiducia"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1740,32 +1879,32 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
@@ -1781,7 +1920,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1789,7 +1928,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1827,7 +1966,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1847,11 +1986,11 @@ msgstr "Cifrari: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1859,7 +1998,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
@@ -1930,470 +2069,470 @@ msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 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:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -2406,7 +2545,7 @@ msgstr "prende le chiavi da questo portachiavi"
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
@@ -2422,335 +2561,11 @@ msgstr ""
 "Sintassi: gpg [opzioni] [file]\n"
 "Controlla le firme con le chiavi affidabili note\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"E compito tuo assegnare un valore; questo valore non sar� mai esportato a\n"
-"terzi. Ci serve per implementare il web-of-trust; non ha nulla a che fare\n"
-"con il web-of-certificates (creato implicitamente)."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Per costruire il Web-Of-Trust, GnuPG ha bisogno di sapere quali chiavi sono\n"
-"definitivamente affidabili - di solito quelle per cui hai accesso alla "
-"chiave\n"
-"segreta.\n"
-"Rispondi \"s�\" per impostare questa chiave come definitivamente affidabile\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "Se vuoi usare comunque questa chiave non fidata, rispondi \"si\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Inserisci l'user ID del destinatario a cui vuoi mandare il messaggio."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"In generale non � una buona idea usare la stessa chiave per le firme e la\n"
-"cifratura. Questo algoritmo dovrebbe solo essere usato in determinati "
-"campi.\n"
-"Per favore consulta prima il tuo esperto di sicurezza."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Inserisci le dimensioni della chiave"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Rispondi \"si\" o \"no\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Inserisci il valore richiesto come indicato dal prompt.\n"
-"� possibile inserire una data in formato ISO (YYYY-MM-DD) ma non avrai un\n"
-"messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
-"dato come un intervallo."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Inserisci il nome del proprietario della chiave"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Inserisci un commento opzionale"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  per cambiare il nome.\n"
-"C  per cambiare il commento.\n"
-"E  per cambiare l'indirizzo di email.\n"
-"O  per continuare con la generazione della chiave.\n"
-"Q  per abbandonare il processo di generazione della chiave."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Rispondi \"si\" (o \"y\") se va bene generare la subchiave."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Quando firmi l'user ID di una chiave dovresti prima verificare che questa\n"
-"appartiene alla persona indicata nell'user ID. � utile agli altri sapere\n"
-"con quanta attenzione lo hai verificato.\n"
-"\n"
-"\"0\" significa che non fai particolari affermazioni sull'attenzione con "
-"cui\n"
-"    hai ferificato la chiave.\n"
-"\n"
-"\"1\" significa che credi che la chiave sia posseduta dalla persona che dice "
-"di\n"
-"    possederla, ma non hai o non hai potuto verificare per niente la "
-"chiave.\n"
-"\n"
-"\"2\" significa che hai fatto una verifica superficiale della chiave. Per "
-"esempio\n"
-"    potrebbe significare che hai verificato l'impronta digitale e "
-"confrontato\n"
-"    l'user ID della chiave con un documento di identit� con fotografia.\n"
-"\n"
-"\"3\" significa che hai fatto una verifica approfondita della chiave. Per "
-"esempio\n"
-"    potrebbe significare che hai verificato di persona l'impronta digitale "
-"con\n"
-"    il possessore della chiave e hai controllato, per esempio per mezzo di\n"
-"    un documento di identit� con fotografia difficile da falsificare (come\n"
-"    un passaporto), che il nome del proprietario della chiave corrisponde a\n"
-"    quello nell'user ID della chiave, e per finire che hai verificato\n"
-"    (scambiando dei messaggi) che l'indirizzo di email sulla chiave "
-"appartiene\n"
-"    al proprietario.\n"
-"\n"
-"Nota che gli esempi indicati per i livelli 2 e 3 sono *solo* esempi. Alla "
-"fine\n"
-"sta a te decidere cosa significano \"superficiale\" e \"approfondita\" "
-"quando\n"
-"firmi chiavi di altri.\n"
-"\n"
-"Se non sai cosa rispondere, rispondi \"0\"."
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Rispondi \"si\" se vuoi firmare TUTTI gli user ID"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Rispondi \"si\" se vuoi davvero cancellare questo user ID.\n"
-"Tutti i certificati saranno persi!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Rispondi \"si\" se va bene cancellare la subchiave"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Questa � una firma valida per la chiave. Normalmente non vorresti "
-"cancellare\n"
-"questa firma perch� pu� essere importante per stabilire una connessione di\n"
-"fiducia alla chiave o a un'altra chiave certificata da questa chiave."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Questa firma non pu� essere verificata perch� non hai la chiave "
-"corrispondente.\n"
-"Dovresti rimandare la sua cancellazione finch� non saprai quale chiave � "
-"stata\n"
-"usata perch� questa chiave potrebbe stabilire una connessione di fiducia\n"
-"attraverso una chiave gi� certificata."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "La firma non � valida. Ha senso rimuoverla dal tuo portachiavi."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Questa � una firma che collega l'user id alla chiave. Solitamente non � una\n"
-"buona idea rimuovere questo tipo di firma. In realt� GnuPG potrebbe non "
-"essere\n"
-"pi� in grado di usare questa chiave. Quindi fallo solo se questa autofirma "
-"non\n"
-"� valida per qualche ragione e ne � disponibile un'altra."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Cambia le preferenze di tutti gli user ID (o solo di quelli selezionati) "
-"con\n"
-"la lista di preferenze corrente. L'orario di tutte le autofirme coinvolte\n"
-"sar� aumentato di un secondo.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Inserisci la passphrase, cio� una frase segreta \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Ripeti l'ultima passphrase per essere sicuro di cosa hai scritto."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Inserisci il nome del file a cui si riferisce la firma."
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Inserisci il nuovo nome del file. Se premi INVIO sar� usato il nome\n"
-"predefinito (quello indicato tra parentesi)."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Dovresti specificare un motivo per questa certificazione. A seconda del\n"
-"contesto hai la possibilit� di scegliere tra questa lista:\n"
-"  \"Key has been compromised\"\n"
-"      Usa questo se hai un motivo per credere che una persona non "
-"autorizzata\n"
-"      abbia avuto accesso alla tua chiave segreta.\n"
-"  \"Key is superseded\"\n"
-"      Usa questo se hai sostituito questa chiave con una pi� recente.\n"
-"  \"Key is no longer used\"\n"
-"      Usa questo se hai mandato in pensione questa chiave.\n"
-"  \"User ID is no longer valid\"\n"
-"      Usa questo per affermare che l'user ID non dovrebbe pi� essere usato;\n"
-"      solitamente � usato per indicare un indirizzo di email non valido.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Se vuoi, puoi digitare un testo che descrive perch� hai emesso\n"
-"questo certificato di revoca. Per favore sii conciso.\n"
-"Una riga vuota termina il testo.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Non � disponibile un aiuto"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
@@ -2945,13 +2760,13 @@ msgstr "chiave %08lX: nuova chiave - saltata\n"
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
@@ -3041,7 +2856,7 @@ msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
@@ -3529,8 +3344,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -3539,20 +3354,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
@@ -3569,7 +3384,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
@@ -3935,93 +3750,93 @@ msgstr "aggiornamento della chiave segreta fallito: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4030,19 +3845,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4051,7 +3866,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4060,76 +3875,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4139,207 +3954,207 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 #, 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:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, 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:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4383,12 +4198,12 @@ msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
@@ -4416,109 +4231,119 @@ msgstr "cifra dati"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4534,7 +4359,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4550,40 +4375,40 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4591,12 +4416,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4613,44 +4438,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4661,7 +4486,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
@@ -4676,23 +4501,23 @@ msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4700,12 +4525,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4717,7 +4542,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4729,50 +4554,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:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4782,12 +4607,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4795,7 +4620,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4803,26 +4628,26 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -5130,191 +4955,191 @@ msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 msgid "public key is %s\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -5333,82 +5158,88 @@ msgstr "trustdb: read fallita (n=%d): %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr ""
+"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo di cifratura non implementato"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 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:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrami ulteriori informazioni\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Non compresso"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
@@ -6207,29 +6038,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, 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:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
@@ -6558,7 +6389,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
@@ -6586,32 +6417,32 @@ msgstr "per favore usa --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@ -6750,12 +6581,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6816,11 +6647,11 @@ msgstr "invio al keyserver fallito: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6932,12 +6763,12 @@ msgstr "Firma %s, algoritmo di digest %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@ -6946,7 +6777,7 @@ msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "lettura delle opzioni da `%s'\n"
@@ -7009,22 +6840,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7033,11 +6864,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -7078,8 +6909,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
@@ -7212,61 +7043,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "genera un certificato di revoca"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifica una firma"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "la preferenza %c%lu � doppia\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "Certificato di revoca creato.\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "certificato danneggiato"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7281,7 +7112,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7402,6 +7233,111 @@ msgstr "errore creando il portachiavi `%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (firma solo)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) RSA (cifra solo)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (firma e cifra)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (firma solo)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (cifra solo)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(Non � stata data una descrizione)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "algoritmo di hash non valido `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Indirizzo di Email: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Inserisci l'user ID. Termina con una riga vuota: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Inserire il nuovo nome del file"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7435,195 +7371,195 @@ msgstr "la preferenza %c%lu � doppia\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "elenca le chiavi segrete"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea un output ascii con armatura"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "risponde \"s�\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "risponde \"no\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta NOME come set di caratteri del terminale"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7634,36 +7570,36 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7770,7 +7706,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7789,31 +7725,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Firma scaduta il %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Firma valida da \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -8273,6 +8209,319 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "E compito tuo assegnare un valore; questo valore non sar� mai esportato "
+#~ "a\n"
+#~ "terzi. Ci serve per implementare il web-of-trust; non ha nulla a che "
+#~ "fare\n"
+#~ "con il web-of-certificates (creato implicitamente)."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Per costruire il Web-Of-Trust, GnuPG ha bisogno di sapere quali chiavi "
+#~ "sono\n"
+#~ "definitivamente affidabili - di solito quelle per cui hai accesso alla "
+#~ "chiave\n"
+#~ "segreta.\n"
+#~ "Rispondi \"s�\" per impostare questa chiave come definitivamente "
+#~ "affidabile\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr "Se vuoi usare comunque questa chiave non fidata, rispondi \"si\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr ""
+#~ "Inserisci l'user ID del destinatario a cui vuoi mandare il messaggio."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "In generale non � una buona idea usare la stessa chiave per le firme e "
+#~ "la\n"
+#~ "cifratura. Questo algoritmo dovrebbe solo essere usato in determinati "
+#~ "campi.\n"
+#~ "Per favore consulta prima il tuo esperto di sicurezza."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Inserisci le dimensioni della chiave"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Rispondi \"si\" o \"no\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Inserisci il valore richiesto come indicato dal prompt.\n"
+#~ "� possibile inserire una data in formato ISO (YYYY-MM-DD) ma non avrai "
+#~ "un\n"
+#~ "messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
+#~ "dato come un intervallo."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Inserisci il nome del proprietario della chiave"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Inserisci un commento opzionale"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  per cambiare il nome.\n"
+#~ "C  per cambiare il commento.\n"
+#~ "E  per cambiare l'indirizzo di email.\n"
+#~ "O  per continuare con la generazione della chiave.\n"
+#~ "Q  per abbandonare il processo di generazione della chiave."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Rispondi \"si\" (o \"y\") se va bene generare la subchiave."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Quando firmi l'user ID di una chiave dovresti prima verificare che "
+#~ "questa\n"
+#~ "appartiene alla persona indicata nell'user ID. � utile agli altri sapere\n"
+#~ "con quanta attenzione lo hai verificato.\n"
+#~ "\n"
+#~ "\"0\" significa che non fai particolari affermazioni sull'attenzione con "
+#~ "cui\n"
+#~ "    hai ferificato la chiave.\n"
+#~ "\n"
+#~ "\"1\" significa che credi che la chiave sia posseduta dalla persona che "
+#~ "dice di\n"
+#~ "    possederla, ma non hai o non hai potuto verificare per niente la "
+#~ "chiave.\n"
+#~ "\n"
+#~ "\"2\" significa che hai fatto una verifica superficiale della chiave. Per "
+#~ "esempio\n"
+#~ "    potrebbe significare che hai verificato l'impronta digitale e "
+#~ "confrontato\n"
+#~ "    l'user ID della chiave con un documento di identit� con fotografia.\n"
+#~ "\n"
+#~ "\"3\" significa che hai fatto una verifica approfondita della chiave. Per "
+#~ "esempio\n"
+#~ "    potrebbe significare che hai verificato di persona l'impronta "
+#~ "digitale con\n"
+#~ "    il possessore della chiave e hai controllato, per esempio per mezzo "
+#~ "di\n"
+#~ "    un documento di identit� con fotografia difficile da falsificare "
+#~ "(come\n"
+#~ "    un passaporto), che il nome del proprietario della chiave corrisponde "
+#~ "a\n"
+#~ "    quello nell'user ID della chiave, e per finire che hai verificato\n"
+#~ "    (scambiando dei messaggi) che l'indirizzo di email sulla chiave "
+#~ "appartiene\n"
+#~ "    al proprietario.\n"
+#~ "\n"
+#~ "Nota che gli esempi indicati per i livelli 2 e 3 sono *solo* esempi. Alla "
+#~ "fine\n"
+#~ "sta a te decidere cosa significano \"superficiale\" e \"approfondita\" "
+#~ "quando\n"
+#~ "firmi chiavi di altri.\n"
+#~ "\n"
+#~ "Se non sai cosa rispondere, rispondi \"0\"."
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Rispondi \"si\" se vuoi firmare TUTTI gli user ID"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Rispondi \"si\" se vuoi davvero cancellare questo user ID.\n"
+#~ "Tutti i certificati saranno persi!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Rispondi \"si\" se va bene cancellare la subchiave"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Questa � una firma valida per la chiave. Normalmente non vorresti "
+#~ "cancellare\n"
+#~ "questa firma perch� pu� essere importante per stabilire una connessione "
+#~ "di\n"
+#~ "fiducia alla chiave o a un'altra chiave certificata da questa chiave."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Questa firma non pu� essere verificata perch� non hai la chiave "
+#~ "corrispondente.\n"
+#~ "Dovresti rimandare la sua cancellazione finch� non saprai quale chiave � "
+#~ "stata\n"
+#~ "usata perch� questa chiave potrebbe stabilire una connessione di fiducia\n"
+#~ "attraverso una chiave gi� certificata."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr "La firma non � valida. Ha senso rimuoverla dal tuo portachiavi."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Questa � una firma che collega l'user id alla chiave. Solitamente non � "
+#~ "una\n"
+#~ "buona idea rimuovere questo tipo di firma. In realt� GnuPG potrebbe non "
+#~ "essere\n"
+#~ "pi� in grado di usare questa chiave. Quindi fallo solo se questa "
+#~ "autofirma non\n"
+#~ "� valida per qualche ragione e ne � disponibile un'altra."
+
+#~ 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 ""
+#~ "Cambia le preferenze di tutti gli user ID (o solo di quelli selezionati) "
+#~ "con\n"
+#~ "la lista di preferenze corrente. L'orario di tutte le autofirme "
+#~ "coinvolte\n"
+#~ "sar� aumentato di un secondo.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "Ripeti l'ultima passphrase per essere sicuro di cosa hai scritto."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Inserisci il nome del file a cui si riferisce la firma."
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Inserisci il nuovo nome del file. Se premi INVIO sar� usato il nome\n"
+#~ "predefinito (quello indicato tra parentesi)."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Dovresti specificare un motivo per questa certificazione. A seconda del\n"
+#~ "contesto hai la possibilit� di scegliere tra questa lista:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Usa questo se hai un motivo per credere che una persona non "
+#~ "autorizzata\n"
+#~ "      abbia avuto accesso alla tua chiave segreta.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Usa questo se hai sostituito questa chiave con una pi� recente.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Usa questo se hai mandato in pensione questa chiave.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Usa questo per affermare che l'user ID non dovrebbe pi� essere "
+#~ "usato;\n"
+#~ "      solitamente � usato per indicare un indirizzo di email non valido.\n"
+
+#~ 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 ""
+#~ "Se vuoi, puoi digitare un testo che descrive perch� hai emesso\n"
+#~ "questo certificato di revoca. Per favore sii conciso.\n"
+#~ "Una riga vuota termina il testo.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "impossibile inserire notation data nelle firme v3 (stile PGP 2.x)\n"
 
@@ -8434,9 +8683,6 @@ msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 #~ msgid "unknown packet type"
 #~ msgstr "pacchetto di tipo sconosciuto"
 
-#~ msgid "unknown version"
-#~ msgstr "versione sconosciuta"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "algoritmo della chiave pubblica sconosciuto"
 
@@ -8551,9 +8797,6 @@ msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 #~ msgid "network error"
 #~ msgstr "errore di rete"
 
-#~ msgid "not encrypted"
-#~ msgstr "non cifrato"
-
 # ??? (Md)
 #~ msgid "not processed"
 #~ msgstr "non esaminato"
@@ -8897,9 +9140,6 @@ msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 #~ msgid "%08lX: We do NOT trust this key\n"
 #~ msgstr "%08lX: NON ci fidiamo di questa chiave!\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (firma e cifra)\n"
-
 #, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "   (%d) RSA (firma solo)\n"
diff --git a/po/ja.po b/po/ja.po
index e7554177a..c220afc17 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -42,51 +42,51 @@ msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 msgid "Quality:"
 msgstr "ͭ����: %s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "������MPI�Ǥ�"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
@@ -96,21 +96,21 @@ msgstr "�ѥ��ե졼���������Ǥ�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -192,8 +192,8 @@ msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "PIN [��̾��: %lu]"
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -272,7 +272,7 @@ msgid "Please enter the new passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -291,13 +291,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "��Ĺ"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
@@ -379,8 +379,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
@@ -396,29 +396,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
@@ -530,12 +531,12 @@ msgstr "%s: �����å�: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -606,7 +607,7 @@ msgstr "����󥻥�"
 msgid "error opening `%s': %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
@@ -631,7 +632,7 @@ msgstr "��%s�פ��ɽФ����顼: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -857,6 +858,145 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "�����ʾ�����Ǥ�"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "�����ʾ�����Ǥ�"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "��ͭ���ǡ�����ɽ��"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "ͭ����: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "�Ź沽����Ƥ��ޤ���"
+
+#: common/audit.c:740
+#, fuzzy
+msgid "Number of recipients"
+msgstr "������:\n"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "��̾�θ��ڤ��ά\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "%s�˻ܤ��줿��̾\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "��%s�ɤ������������̾"
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "%s�˻ܤ��줿��̾\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "���θ�����λ�Ǥ�!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "�����ʾ�����Ǥ�"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "�����ʾ�����Ǥ�"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "�����ʾ�����Ǥ�"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "̤�ΤΥС������Ǥ�"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "��%s�פΥإ�פϤ���ޤ���"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "�����ιԤ˥��顼������ޤ�\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -976,13 +1116,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "�����? "
 
@@ -1149,7 +1289,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
@@ -1253,18 +1393,18 @@ msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1304,7 +1444,7 @@ msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -1323,7 +1463,7 @@ msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 msgid "`%s' already compressed\n"
 msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: ��%s�פ϶��Υե�����Ǥ�\n"
@@ -1348,7 +1488,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1375,17 +1515,17 @@ msgstr "%s/%s�Ź沽 ������:��%s��\n"
 msgid "%s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ���\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
 
-#: g10/encr-data.c:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "�Ź沽�ѥ��åȤμ谷���Ǿ㳲\n"
 
@@ -1531,7 +1671,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
@@ -1546,7 +1686,7 @@ msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1562,27 +1702,27 @@ msgstr "|[�ե�����]|��̾�����"
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "�����"
 
@@ -1594,11 +1734,11 @@ msgstr "���Ƚ�̾�ΰ���"
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
@@ -1634,11 +1774,11 @@ msgstr "���������������"
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
@@ -1674,11 +1814,11 @@ msgstr "���ѥǡ����١����򹹿�"
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1689,36 +1829,36 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
@@ -1734,7 +1874,7 @@ msgstr "��̩��OpenPGP�ο�������"
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1743,7 +1883,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1781,7 +1921,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1801,11 +1941,11 @@ msgstr "�Ź�ˡ: "
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1813,7 +1953,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
@@ -1884,456 +2024,456 @@ msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2970
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2976
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:2989
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3212
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3217
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -2345,7 +2485,7 @@ msgstr "���θ����ؤ��������ޤ�"
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
@@ -2363,326 +2503,11 @@ msgstr ""
 "��ʸ: gpg [���ץ����] [�ե�����]\n"
 "���Το��Ѥ������ǽ�̾�򸡺�\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"�����ͤλ���ϡ����ʤ�����Ǥ��������ͤϡ��軰�Ԥ˷褷\n"
-"���󶡤���ޤ��󡣤���ϡ�web-of-trust �μ�����ɬ�פǡ�\n"
-"(����Ū�ˤǤ���) web-of-certificates �Ȥ�̵�ط��Ǥ���"
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Web-of-Trust���ۤ��뤿��GnuPG�ϡ��ɤθ�������Ū�˿��Ѥ���\n"
-"�Τ����Τ�ɬ�פ�����ޤ�������ϤդĤ�����̩���˥��������Ǥ�\n"
-"�븰�Τ��ȤǤ������θ�������Ū�˿��Ѥ��뤳�Ȥˤ���ʤ顢\n"
-"��yes�ɤ������Ƥ���������\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�ɤ������Ƥ���������"
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "���ʤ��������å���������Υ桼����ID�����Ϥ��Ƥ���������"
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"���Ѥ��륢�르�ꥺ������򤷤Ƥ���������\n"
-"\n"
-"DSA (��̾DSS) �ϡ���̾���Ѥ��Żҽ�̾���르�ꥺ��Ǥ���\n"
-"\n"
-"Elgamal�ϡ��Ź沽�ΤߤΥ��르�ꥺ��Ǥ���\n"
-"\n"
-"RSA�ϡ���̾�ˤ�Ź沽�ˤ�Ȥ��ޤ���\n"
-"\n"
-"�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ���"
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"���̤ˡ���̾�ȰŹ沽��Ʊ������Ȥ��Τϡ������������ޤ���\n"
-"���Υ��르�ꥺ��ϡ�������ϰ�������ǻȤ���٤��Ǥ���\n"
-"�ޤ����������ƥ���������Ȥˤ����̤���������"
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "����Ĺ�������Ϥ��Ƥ�������"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "��yes�ɤ���no�ɤ������Ƥ�������"
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"�ץ���ץȤ˼����񼰤��ͤ����Ϥ��Ƥ���������\n"
-"ISO�����դν� (YYYY-MM-DD) �Ǥ����ϤǤ��ޤ��������������顼��\n"
-"ɽ������ʤ��Ǥ��礦���������ꡢ�����ƥ�������ͤ���֤��Ѵ�\n"
-"����褦�˻�ߤޤ���"
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "����ͭ�Ԥ�̾�������Ϥ��Ƥ�������"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "���ץ����Ǥ������Żҥ᡼��Υ��ɥ쥹�����Ϥ��뤳�Ȥ򶯤��侩���ޤ�"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "���ץ����Υ����Ȥ����Ϥ��Ƥ�������"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  ̾�����ѹ���\n"
-"C  �����Ȥ��ѹ���\n"
-"E  �Żҥ᡼�롦���ɥ쥹���ѹ���\n"
-"O  ��������³�ԡ�\n"
-"Q  �������ν�λ��"
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "�������������Ƥ褱��С���yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"���Υ桼����ID�˽�̾����Ȥ��ϡ����Υ桼����ID��̾���οͤ���\n"
-"���ͭ���Ƥ��롢�Ȥ������Ȥ򸡾ڤ���٤��Ǥ������ʤ����ɤ���\n"
-"�����տ�����ǧ�����Τ���¾�οͤ������Τ餻��ȡ������Ǥ���\n"
-"\n"
-"\"0\" �ϡ����ʤ����ɤ��������տ�����ǧ�����Τ����ä˼�ĥ����\n"
-"    ���Ȥ�����̣�Ǥ���\n"
-"\n"
-"\"1\" �ϡ����ν�ͭ�Ԥȼ�ĥ���Ƥ���ͤ����θ����ͭ���Ƥ��롢��\n"
-"    ���ʤ��Ͽ����ƤϤ����ΤΡ����ڤ��������Ƥʤ��ä����ޤ�\n"
-"    �ϤǤ��ʤ��ä����Ȥ�����̣�Ǥ�������ϡ��ڥ�͡����Ȥ�\n"
-"    �桼�����θ��˽�̾������Ρ��֥ڥ륽�ʡ׳�ǧ�������Ǥ���\n"
-"\n"
-"\"2\" �ϡ����ʤ���������γ�ǧ�򤷤����Ȥ�����̣�Ǥ������Ȥ���\n"
-"    ���λ���򸡾ڤ����ե���ID�ˤ������Ƹ��Υ桼����ID�򸡺�\n"
-"    ������礬�����Ǥ���\n"
-"\n"
-"\"3\" �ϡ����ʤ������ϰϤˤ錄�기�򸡾ڤ������Ȥ�����̣�Ǥ���\n"
-"    ���Ȥ��С����ν�ͭ���ܿͤȸ��λ���򸡾ڤ���(�ѥ��ݡ���\n"
-"    �Τ褦��) ��¤�Τ�Ĥ��������ե���ID�Ĥ��μ��ʤǡ����ν�\n"
-"    ͭ�Ԥ�̾���������Υ桼����ID��̾���Ȱ��פ��뤳�Ȥ򸡺���\n"
-"    �ơ�(�Żҥ᡼��θ򴹤ʤɤ�) �����Żҥ᡼�롦���ɥ쥹��\n"
-"    ���ν�ͭ�Ԥ�°���Ƥ��뤳�Ȥ򸡾ڤ�����礬�����Ǥ���\n"
-"\n"
-"�嵭2��3����ϡ�*ñ�ʤ�*��ˤ����ʤ����Ȥ������Ȥ�ǰƬ�ˤ���\n"
-"�Ƥ���������¾�θ��˽�̾����ݡ��ذ���٤�ع��ϰϡ٤������\n"
-"̣���뤫��ǽ�Ū�˷���Τϡ����ʤ��Ǥ���\n"
-"\n"
-"���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������"
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "���Ƥ� �桼����ID�˽�̾��������С���yes�ɤ������Ƥ�������"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"���Υ桼����ID�������˺����������С���yes�ɤ������Ƥ���������\n"
-"�����������Ʊ���˾õ�ޤ�!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "���������������Ƥ褱��С���yes�ɤ������Ƥ�������"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"����ϸ��ˤ�������ͭ���ʽ�̾�Ǥ������̤��ν�̾��������٤���\n"
-"�Ϥʤ��Ǥ��礦���ʤ��ʤ顢���ν�̾�ϡ����ؤο��Ѥ��ؤκ����䡢\n"
-"���θ��ˤ������ˤȤäƽ��פ�����Ǥ���"
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"���ν�̾�Ȱ��פ��븰����ͭ���Ƥ��ʤ��Τǡ����ν�̾�ϸ����Ǥ��ޤ���\n"
-"���θ������Ѥ����ޤǤϡ����ʤ��Ϥ��ν�̾�κ������α����٤��Ǥ���\n"
-"�ʤ��ʤ顢���ν�̾�θ��ϡ��⤦�������줿¾�θ��ǿ��Ѥ��ؤ��������\n"
-"���⤷��ʤ�����Ǥ���"
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-"���ν�̾��ͭ���ǤϤ���ޤ��󡣤��Τ��Ȥϡ����ʤ��θ��ؤ��������٤���\n"
-"�Ȥ�����̣�Ǥ���"
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"����ϡ����Υ桼����ID���б�������̾�Ǥ����̾���ν�̾��������Τ�\n"
-"�����ͤ��ǤϤ���ޤ��󡣼ºݤˤϡ�GnuPG�Ϥ�Ϥ䤳�θ���Ȥ��ʤ��Τ���\n"
-"����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��ͭ���ǤϤʤ��ơ�\n"
-"���ؤȤʤ븰��������ˤΤߡ������¹Ԥ��Ƥ���������"
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"���� (�ޤ������򤷤�) �桼����ID�������򡢺��������������ѹ�\n"
-"���ޤ����ط����뼫�ʽ�̾�������ϡ�1�ä����ߤޤ���\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "���Ϥ����ѥ��ե졼���γ�ǧ�Τ��ᡢ�����Ϥ��Ƥ���������"
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "��񤭤��Ƥ褱��С���yes�ɤ������Ƥ�������"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"�������ե�����̾�����Ϥ��Ƥ���������ñ��RETURN���ǤĤȡ�\n"
-"(��̤Ǽ�����) ����Υե�����̾����Ѥ��ޤ���"
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"������ͳ����ꤹ�٤��Ǥ�������ط��ˤ������äơ�\n"
-"�ʲ��ΰ����������֤��Ȥ��Ǥ��ޤ���\n"
-"  �ָ����ѥ����ޤ�����\n"
-"      ǧ�ڤ���Ƥ��ʤ��ͤ���̩���ؤΥ����������������ȿ�����\n"
-"      ��­����ͳ�Τ���Ȥ��ˡ������Ȥ��ޤ���\n"
-"  �ָ����Ȥ꤫��äƤ��ޤ���\n"
-"      ���θ���ʬ�ǿ��������ȸ򴹤����Ȥ��˻Ȥ��ޤ���\n"
-"  �ָ��Ϥ⤦���ѤǤ���\n"
-"      ���θ���Ȥ��Τ��᤿�Ȥ��˻Ȥ��ޤ���\n"
-"  �֥桼����ID���⤦̵���Ǥ���\n"
-"      �⤦���Υ桼����ID�ϻȤ��٤��Ǥʤ����Ȥ����Ȥ��˻Ȥ�\n"
-"      �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
-"      ���˻Ȥ��ޤ���\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"�⤷������������С��ʤ������������ȯ�Ԥ���Τ�����������\n"
-"ʸ�Ϥ����Ϥ��뤳�Ȥ��Ǥ��ޤ���ʸ�Ϥϴʷ�ˤ��Ƥ���������\n"
-"���Ԥǽ����ˤʤ�ޤ���\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "�إ�פϤ���ޤ���"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "��%s�פΥإ�פϤ���ޤ���"
@@ -2878,13 +2703,13 @@ msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
@@ -2973,7 +2798,7 @@ msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
@@ -3426,8 +3251,8 @@ msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
@@ -3436,20 +3261,20 @@ msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
@@ -3466,7 +3291,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
@@ -3821,23 +3646,23 @@ msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3845,71 +3670,71 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2698
+#: g10/keyedit.c:2699
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2720
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3917,17 +3742,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -3935,7 +3760,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3944,75 +3769,75 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4021,191 +3846,191 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3426
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3448
+#: g10/keyedit.c:3449
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3474
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "��̾����: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -4245,12 +4070,12 @@ msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
@@ -4276,109 +4101,119 @@ msgstr "Encrypt"
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "��%s�˲�ǽ�����: "
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "������ǽ�����: "
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) ��̾�Ϥ�ȿž\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) �Ź��Ϥ�ȿž\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) ǧ���Ϥ�ȿž\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) ��λ\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA��Elgamal (����)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4394,7 +4229,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4410,40 +4245,40 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4451,11 +4286,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4471,44 +4306,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4519,7 +4354,7 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
@@ -4534,23 +4369,23 @@ msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4558,12 +4393,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4575,7 +4410,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4586,50 +4421,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4638,42 +4473,42 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
@@ -4971,191 +4806,191 @@ msgstr "̤�Τ����󥢥르�ꥺ����������줿�ѥ��ե졼�� %d\n"
 msgid "public key is %s\n"
 msgstr "��������%s�Ǥ�\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ˤ��Ź沽�Ѥߥǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %s, ����%s�˰Ź沽����ޤ���\n"
 
-#: g10/mainproc.c:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ��%s��\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s��, ID %s�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ�������\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź�ˡ��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s��%s�����\n"
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "��%s�ɤ���� ������ ��̾"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -5174,80 +5009,85 @@ msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "̵����"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
@@ -5984,25 +5824,25 @@ msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
 
-#: g10/sign.c:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
@@ -6326,7 +6166,7 @@ msgstr "����Ū"
 msgid "no need for a trustdb check\n"
 msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "����ο��ѥǡ����١��������ϡ�%s�Ǥ�\n"
@@ -6354,32 +6194,32 @@ msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
 msgid "checking the trustdb\n"
 msgstr "���ѥǡ����١����θ���\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "����Ū�˿��Ѥ��븰%s�θ����������Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "�Ǿ��Ρ֤������٤ο��ѡ�%d���Ǿ��Ρ�����Ū���ѡ�%d��%s���ѥ�ǥ�\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "����: %d  ͭ����: %3d  ��̾: %3d  ����: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6520,12 +6360,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
@@ -6586,11 +6426,11 @@ msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
@@ -6699,12 +6539,12 @@ msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
@@ -6713,7 +6553,7 @@ msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
@@ -6773,22 +6613,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6797,12 +6637,12 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 #, fuzzy
 msgid "chain"
 msgstr "admin"
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -6843,8 +6683,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
@@ -6978,61 +6818,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "���������������"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "��̾�򸡾�"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "������%s�פν�ʣ\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "����������������\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7047,7 +6887,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7168,6 +7008,112 @@ msgstr "���ء�%s�פκ������顼: %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (��̾�Τ�)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (2) �Ź沽��\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, fuzzy, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "��%s�˲�ǽ�����: "
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) DSA (��̾�Τ�)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (��̾�Τ�)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(�����Ϥ���ޤ���)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "�Żҥ᡼�롦���ɥ쥹: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"�桼����ID�����ϡ����Ԥǽ�λ: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "�������ե�����̾�����Ϥ��Ƥ�������"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "ͽ�������������ϡ����Ԥǽ�λ:\n"
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "PIN������: "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7201,204 +7147,204 @@ msgstr "������%s�פν�ʣ\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "��̩���ΰ���"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "register a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ASCII���������������"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��̾�μ���"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7409,36 +7355,36 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7545,7 +7491,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7564,31 +7510,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "��%s�ɤ������������̾"
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                ��̾��%s��"
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
@@ -8045,6 +7991,310 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "�����ͤλ���ϡ����ʤ�����Ǥ��������ͤϡ��軰�Ԥ˷褷\n"
+#~ "���󶡤���ޤ��󡣤���ϡ�web-of-trust �μ�����ɬ�פǡ�\n"
+#~ "(����Ū�ˤǤ���) web-of-certificates �Ȥ�̵�ط��Ǥ���"
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Web-of-Trust���ۤ��뤿��GnuPG�ϡ��ɤθ�������Ū�˿��Ѥ���\n"
+#~ "�Τ����Τ�ɬ�פ�����ޤ�������ϤդĤ�����̩���˥��������Ǥ�\n"
+#~ "�븰�Τ��ȤǤ������θ�������Ū�˿��Ѥ��뤳�Ȥˤ���ʤ顢\n"
+#~ "��yes�ɤ������Ƥ���������\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�ɤ������Ƥ���������"
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "���ʤ��������å���������Υ桼����ID�����Ϥ��Ƥ���������"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "���Ѥ��륢�르�ꥺ������򤷤Ƥ���������\n"
+#~ "\n"
+#~ "DSA (��̾DSS) �ϡ���̾���Ѥ��Żҽ�̾���르�ꥺ��Ǥ���\n"
+#~ "\n"
+#~ "Elgamal�ϡ��Ź沽�ΤߤΥ��르�ꥺ��Ǥ���\n"
+#~ "\n"
+#~ "RSA�ϡ���̾�ˤ�Ź沽�ˤ�Ȥ��ޤ���\n"
+#~ "\n"
+#~ "�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ���"
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "���̤ˡ���̾�ȰŹ沽��Ʊ������Ȥ��Τϡ������������ޤ���\n"
+#~ "���Υ��르�ꥺ��ϡ�������ϰ�������ǻȤ���٤��Ǥ���\n"
+#~ "�ޤ����������ƥ���������Ȥˤ����̤���������"
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "����Ĺ�������Ϥ��Ƥ�������"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "��yes�ɤ���no�ɤ������Ƥ�������"
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "�ץ���ץȤ˼����񼰤��ͤ����Ϥ��Ƥ���������\n"
+#~ "ISO�����դν� (YYYY-MM-DD) �Ǥ����ϤǤ��ޤ��������������顼��\n"
+#~ "ɽ������ʤ��Ǥ��礦���������ꡢ�����ƥ�������ͤ���֤��Ѵ�\n"
+#~ "����褦�˻�ߤޤ���"
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "����ͭ�Ԥ�̾�������Ϥ��Ƥ�������"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr ""
+#~ "���ץ����Ǥ������Żҥ᡼��Υ��ɥ쥹�����Ϥ��뤳�Ȥ򶯤��侩���ޤ�"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "���ץ����Υ����Ȥ����Ϥ��Ƥ�������"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  ̾�����ѹ���\n"
+#~ "C  �����Ȥ��ѹ���\n"
+#~ "E  �Żҥ᡼�롦���ɥ쥹���ѹ���\n"
+#~ "O  ��������³�ԡ�\n"
+#~ "Q  �������ν�λ��"
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr ""
+#~ "�������������Ƥ褱��С���yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "���Υ桼����ID�˽�̾����Ȥ��ϡ����Υ桼����ID��̾���οͤ���\n"
+#~ "���ͭ���Ƥ��롢�Ȥ������Ȥ򸡾ڤ���٤��Ǥ������ʤ����ɤ���\n"
+#~ "�����տ�����ǧ�����Τ���¾�οͤ������Τ餻��ȡ������Ǥ���\n"
+#~ "\n"
+#~ "\"0\" �ϡ����ʤ����ɤ��������տ�����ǧ�����Τ����ä˼�ĥ����\n"
+#~ "    ���Ȥ�����̣�Ǥ���\n"
+#~ "\n"
+#~ "\"1\" �ϡ����ν�ͭ�Ԥȼ�ĥ���Ƥ���ͤ����θ����ͭ���Ƥ��롢��\n"
+#~ "    ���ʤ��Ͽ����ƤϤ����ΤΡ����ڤ��������Ƥʤ��ä����ޤ�\n"
+#~ "    �ϤǤ��ʤ��ä����Ȥ�����̣�Ǥ�������ϡ��ڥ�͡����Ȥ�\n"
+#~ "    �桼�����θ��˽�̾������Ρ��֥ڥ륽�ʡ׳�ǧ�������Ǥ���\n"
+#~ "\n"
+#~ "\"2\" �ϡ����ʤ���������γ�ǧ�򤷤����Ȥ�����̣�Ǥ������Ȥ���\n"
+#~ "    ���λ���򸡾ڤ����ե���ID�ˤ������Ƹ��Υ桼����ID�򸡺�\n"
+#~ "    ������礬�����Ǥ���\n"
+#~ "\n"
+#~ "\"3\" �ϡ����ʤ������ϰϤˤ錄�기�򸡾ڤ������Ȥ�����̣�Ǥ���\n"
+#~ "    ���Ȥ��С����ν�ͭ���ܿͤȸ��λ���򸡾ڤ���(�ѥ��ݡ���\n"
+#~ "    �Τ褦��) ��¤�Τ�Ĥ��������ե���ID�Ĥ��μ��ʤǡ����ν�\n"
+#~ "    ͭ�Ԥ�̾���������Υ桼����ID��̾���Ȱ��פ��뤳�Ȥ򸡺���\n"
+#~ "    �ơ�(�Żҥ᡼��θ򴹤ʤɤ�) �����Żҥ᡼�롦���ɥ쥹��\n"
+#~ "    ���ν�ͭ�Ԥ�°���Ƥ��뤳�Ȥ򸡾ڤ�����礬�����Ǥ���\n"
+#~ "\n"
+#~ "�嵭2��3����ϡ�*ñ�ʤ�*��ˤ����ʤ����Ȥ������Ȥ�ǰƬ�ˤ���\n"
+#~ "�Ƥ���������¾�θ��˽�̾����ݡ��ذ���٤�ع��ϰϡ٤������\n"
+#~ "̣���뤫��ǽ�Ū�˷���Τϡ����ʤ��Ǥ���\n"
+#~ "\n"
+#~ "���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������"
+
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "���Ƥ� �桼����ID�˽�̾��������С���yes�ɤ������Ƥ�������"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "���Υ桼����ID�������˺����������С���yes�ɤ������Ƥ���������\n"
+#~ "�����������Ʊ���˾õ�ޤ�!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "���������������Ƥ褱��С���yes�ɤ������Ƥ�������"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "����ϸ��ˤ�������ͭ���ʽ�̾�Ǥ������̤��ν�̾��������٤���\n"
+#~ "�Ϥʤ��Ǥ��礦���ʤ��ʤ顢���ν�̾�ϡ����ؤο��Ѥ��ؤκ����䡢\n"
+#~ "���θ��ˤ������ˤȤäƽ��פ�����Ǥ���"
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "���ν�̾�Ȱ��פ��븰����ͭ���Ƥ��ʤ��Τǡ����ν�̾�ϸ����Ǥ��ޤ���\n"
+#~ "���θ������Ѥ����ޤǤϡ����ʤ��Ϥ��ν�̾�κ������α����٤��Ǥ���\n"
+#~ "�ʤ��ʤ顢���ν�̾�θ��ϡ��⤦�������줿¾�θ��ǿ��Ѥ��ؤ��������\n"
+#~ "���⤷��ʤ�����Ǥ���"
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "���ν�̾��ͭ���ǤϤ���ޤ��󡣤��Τ��Ȥϡ����ʤ��θ��ؤ��������٤���\n"
+#~ "�Ȥ�����̣�Ǥ���"
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "����ϡ����Υ桼����ID���б�������̾�Ǥ����̾���ν�̾��������Τ�\n"
+#~ "�����ͤ��ǤϤ���ޤ��󡣼ºݤˤϡ�GnuPG�Ϥ�Ϥ䤳�θ���Ȥ��ʤ��Τ���\n"
+#~ "����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��ͭ���ǤϤʤ��ơ�\n"
+#~ "���ؤȤʤ븰��������ˤΤߡ������¹Ԥ��Ƥ���������"
+
+#~ 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 ""
+#~ "���� (�ޤ������򤷤�) �桼����ID�������򡢺��������������ѹ�\n"
+#~ "���ޤ����ط����뼫�ʽ�̾�������ϡ�1�ä����ߤޤ���\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "���Ϥ����ѥ��ե졼���γ�ǧ�Τ��ᡢ�����Ϥ��Ƥ���������"
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "��񤭤��Ƥ褱��С���yes�ɤ������Ƥ�������"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "�������ե�����̾�����Ϥ��Ƥ���������ñ��RETURN���ǤĤȡ�\n"
+#~ "(��̤Ǽ�����) ����Υե�����̾����Ѥ��ޤ���"
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "������ͳ����ꤹ�٤��Ǥ�������ط��ˤ������äơ�\n"
+#~ "�ʲ��ΰ����������֤��Ȥ��Ǥ��ޤ���\n"
+#~ "  �ָ����ѥ����ޤ�����\n"
+#~ "      ǧ�ڤ���Ƥ��ʤ��ͤ���̩���ؤΥ����������������ȿ�����\n"
+#~ "      ��­����ͳ�Τ���Ȥ��ˡ������Ȥ��ޤ���\n"
+#~ "  �ָ����Ȥ꤫��äƤ��ޤ���\n"
+#~ "      ���θ���ʬ�ǿ��������ȸ򴹤����Ȥ��˻Ȥ��ޤ���\n"
+#~ "  �ָ��Ϥ⤦���ѤǤ���\n"
+#~ "      ���θ���Ȥ��Τ��᤿�Ȥ��˻Ȥ��ޤ���\n"
+#~ "  �֥桼����ID���⤦̵���Ǥ���\n"
+#~ "      �⤦���Υ桼����ID�ϻȤ��٤��Ǥʤ����Ȥ����Ȥ��˻Ȥ�\n"
+#~ "      �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
+#~ "      ���˻Ȥ��ޤ���\n"
+
+#~ 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 ""
+#~ "�⤷������������С��ʤ������������ȯ�Ԥ���Τ�����������\n"
+#~ "ʸ�Ϥ����Ϥ��뤳�Ȥ��Ǥ��ޤ���ʸ�Ϥϴʷ�ˤ��Ƥ���������\n"
+#~ "���Ԥǽ����ˤʤ�ޤ���\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
 
@@ -8201,9 +8451,6 @@ msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 #~ msgid "Enter Admin PIN: "
 #~ msgstr "Admin PIN������: "
 
-#~ msgid "Enter PIN: "
-#~ msgstr "PIN������: "
-
 #, fuzzy
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
@@ -8218,9 +8465,6 @@ msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 #~ msgid "unknown packet type"
 #~ msgstr "̤�ΤΥѥ��åȷ��Ǥ�"
 
-#~ msgid "unknown version"
-#~ msgstr "̤�ΤΥС������Ǥ�"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "̤�Τθ��������르�ꥺ��Ǥ�"
 
@@ -8329,9 +8573,6 @@ msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 #~ msgid "network error"
 #~ msgstr "�ͥåȥ�������顼"
 
-#~ msgid "not encrypted"
-#~ msgstr "�Ź沽����Ƥ��ޤ���"
-
 #~ msgid "not processed"
 #~ msgstr "̤����"
 
diff --git a/po/nb.po b/po/nb.po
index 0148735f3..4f07f3b1e 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -42,51 +42,51 @@ msgstr ""
 msgid "Quality:"
 msgstr "gyldighet: %s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i navn\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "ugyldig MPI"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "ugyldig passfrase"
@@ -96,21 +96,21 @@ msgstr "ugyldig passfrase"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -192,8 +192,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
@@ -272,7 +272,7 @@ msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -291,13 +291,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "fyldig output"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
@@ -379,8 +379,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
@@ -396,29 +396,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
@@ -528,12 +529,12 @@ msgstr "%s: hoppet over: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -601,7 +602,7 @@ msgstr "cancel|cancel"
 msgid "error opening `%s': %s\n"
 msgstr "feil med �%s�: %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "valgfil �%s�: %s\n"
@@ -626,7 +627,7 @@ msgstr "lesefeil ved �%s�: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -849,6 +850,143 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "ugyldig sertifikat"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "ugyldig sertifikat"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "vis alle tilgjengelige data"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "n�kkelknippet �%s� ble opprettet\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "gyldighet: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"St�ttede algoritmer:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "ikke kryptert"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+msgid "Data verification succeeded"
+msgstr ""
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Signatur opprettet %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "ingen signatur ble funnet\n"
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "ugyldig hashalgoritme �%s�\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Signatur opprettet %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Denne n�kkelen er utg�tt!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "ugyldig sertifikat"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "ugyldig sertifikat"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "ugyldig sertifikat"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "ukjent versjon"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, c-format
+msgid "No help available for `%s'."
+msgstr ""
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "feil i trailerlinje\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -966,13 +1104,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnummer %s oppdaget\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke gj�re dette i batchmodus\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
@@ -1139,7 +1277,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsn�kkel\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
@@ -1243,18 +1381,18 @@ msgstr "Ugyldig kommando  (pr�v �help�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1294,7 +1432,7 @@ msgstr "det finnes en hemmelig n�kkel for offentlig n�kkel �%s�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "bruk valget �--delete-secret-keys� for � slette den f�rst.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
@@ -1313,7 +1451,7 @@ msgstr "bruker cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "�%s� er allerede komprimert\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: �%s� er en tom fil\n"
@@ -1343,7 +1481,7 @@ msgstr ""
 "ADVARSEL: p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1373,19 +1511,19 @@ msgstr "%s/%s kryptert for: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "%s krypterte data\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "problem ved h�ndtering av kryptert pakke\n"
 
@@ -1527,7 +1665,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
@@ -1542,7 +1680,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1558,27 +1696,27 @@ msgstr "|[fil]|lage en signatur"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "liste n�kler"
 
@@ -1590,11 +1728,11 @@ msgstr "liste n�kler og signaturer"
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
@@ -1630,11 +1768,11 @@ msgstr "generere et opphevingssertifikat"
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
@@ -1670,11 +1808,11 @@ msgstr "oppdatere tillitsdatabasen"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1685,32 +1823,32 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
@@ -1726,7 +1864,7 @@ msgstr "bruk streng OpenPGP-oppf�rsel"
 msgid "generate PGP 2.x compatible messages"
 msgstr "generere PGP 2.x-kompatible meldinger"
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1734,7 +1872,7 @@ msgstr ""
 "@\n"
 "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1772,7 +1910,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1792,11 +1930,11 @@ msgstr "Cipher: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Kompresjon: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1804,7 +1942,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
@@ -1885,450 +2023,450 @@ 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:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -2340,7 +2478,7 @@ msgstr "hent n�klene fra dette n�kkelknippet"
 msgid "make timestamp conflicts only a warning"
 msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
@@ -2356,262 +2494,11 @@ msgstr ""
 "Bruksm�te: gpgv [valg] [filer]\n"
 "Sjekke signaturer mot kjente betrodde n�kler\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr ""
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr ""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr ""
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr ""
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr ""
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr ""
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"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 signerer en brukerid p� en n�kkel, b�r du f�rst bekrefte at\n"
-"n�kkelen tilh�rer den personen som er angitt i brukeriden.  Det er\n"
-"nyttig for andre � vite hvor n�yaktig du bekreftet dette.\n"
-"\n"
-"\"0\" betyr at du forteller hvor n�ye du bekreftet n�kkelen.\n"
-"\n"
-"\"1\" betyr at du tror at n�kkelen eies av den personen som p�st�r � eie\n"
-"    n�kkelen, men du kunne ikke eller bekreftet ikke n�kkelen i det hele\n"
-"    tatt.  Dette er nyttig for en identitetskontroll hvor du signerer\n"
-"    n�kkelen til et pseudonym.\n"
-"\n"
-"\"2\" betyr at du gjorde en vanlig bekreftelse av n�kkelen.  For eksempel,\n"
-"    dette kunne bety at du bekreftet n�kkelens fingeravtrykk og sjekket\n"
-"    brukeriden mot et fotografisk id.\n"
-"\n"
-"\"3\" betyr at du gjorde en utfyllende bekreftelse av n�kkelen.  For\n"
-"    eksempel, dette kunne bety at du og eieren av n�kkelen bekreftet\n"
-"    personlig n�kkelens fingeravtrykk og at du sjekket ved hjelp av et\n"
-"    dokument med fotografi som er vanskelig � forfalske at navnet p�\n"
-"    n�kkeleieren stemmer med navnet i brukeriden til n�kkelen og til slutt\n"
-"    at du bekreftet at epostadressen i n�kkelen tilh�rer n�kkelens eier.\n"
-"\n"
-"V�r obs p� at eksemplene gitt over for niv�ene 2 og 3 *bare* er\n"
-"eksempler.  Alt i alt er det opp til deg � bestemme hva �vanlig� og\n"
-"�utfyllende� betyr n�r du signerer andres n�kler.\n"
-"\n"
-"Svar �0� dersom du ikke vet hva det riktige svaret er."
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr ""
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr ""
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr ""
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr ""
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr ""
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr ""
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr ""
@@ -2803,13 +2690,13 @@ msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til �%s�\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
@@ -2898,7 +2785,7 @@ msgstr "n�kkel %s: hemmelig n�kkel med ugyldig cipher %d - hoppet over\n"
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemmelig n�kkel er ikke tillatt\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard hemmelig n�kkelknippe: %s\n"
@@ -3348,8 +3235,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:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
@@ -3358,19 +3245,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Denne n�kkelen er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "N�kkelen er beskyttet.\n"
 
@@ -3385,7 +3272,7 @@ msgid ""
 "\n"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
 
@@ -3710,376 +3597,376 @@ msgstr "oppdatering av hemmelig mislyktes: %s\n"
 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:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "S�rtrekk: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "utg�r: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "bruksm�te: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Denne n�kkelen har blitt utkoblet"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "utg�tt"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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:3020
+#: g10/keyedit.c:3021
 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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 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:3031
+#: g10/keyedit.c:3032
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettet %d signatur.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 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:3366
+#: g10/keyedit.c:3367
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3426
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3448
+#: g10/keyedit.c:3449
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3474
 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "Vennligst velg minst en undern�kkel.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
 
-#: g10/keyedit.c:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 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:4147
+#: g10/keyedit.c:4148
 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:4209
+#: g10/keyedit.c:4210
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk den %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (ikke-opphevbar)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "ingen hemmelig n�kkel\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "brukerid �%s� er allerede opphevet\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�kkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4119,12 +4006,12 @@ msgid "writing key binding signature\n"
 msgstr "skriver n�kkelbindende signatur\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
@@ -4154,109 +4041,119 @@ msgstr "Autentisere"
 # K og k for kryptering
 # A og a for autentisering
 # Q og q for avslutte
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil ha:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (bare signering)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (bare kryptering)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (bare signering)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (bare kryptering)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-n�kkelpar vil ha %u bits.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�kkelst�rrelse er %u bits\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bits\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4272,7 +4169,7 @@ msgstr ""
 "      <n>m = n�kkelen utg�r om n months\n"
 "      <n>y = n�kkelen utg�r om n years\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4288,38 +4185,38 @@ msgstr ""
 "      <n>m = signaturen utg�r om n months\n"
 "      <n>y = signaturen utg�r om n years\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "N�kkelen er gyldig for? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "N�kkel utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "N�kkel utg�r den %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utg�r den %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4327,11 +4224,11 @@ msgstr ""
 "Systemet ditt kan ikke vise datoer etter 2038.\n"
 "Likevel vil det bli h�ndtert korrekt opp til 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4347,44 +4244,44 @@ msgstr ""
 "    �Heinrich Heine (Der Dichter) <[email protected]>�\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Navnet kan ikke starte med et siffer\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navnet m� v�re minst 5 tegn langt\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruker tegnsettet �%s�.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4395,7 +4292,7 @@ msgstr ""
 "    �%s�\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
@@ -4411,23 +4308,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Vennligst korriger feilen f�rst\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4435,12 +4332,12 @@ msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4452,7 +4349,7 @@ msgstr ""
 "hjelp av dette programmet og valget �--edit-key�.\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4464,50 +4361,50 @@ msgstr ""
 "diskene jobbe) under primtallgenereringen; dette gir\n"
 "tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "N�kkelgenereringen ble avbrutt.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentlig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver forel�pig hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 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"
@@ -4516,13 +4413,13 @@ msgstr ""
 "kanskje � bruke kommandoen �--edit-key� for � generere en\n"
 "sekund�rn�kkel for dette form�let.\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
 # Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4531,7 +4428,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4539,27 +4436,27 @@ msgstr ""
 "n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "Virkelig opprette? (j/N)"
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4856,191 +4753,191 @@ msgstr "passfrase er generert med en ukjent digest-algoritme %d\n"
 msgid "public key is %s\n"
 msgstr "offentlig n�kkel er %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig n�kkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      �%s�\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-n�kkel, ID %s\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig n�kkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=�%.*s�\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 msgid "no signature found\n"
 msgstr "ingen signatur ble funnet\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruker %s n�kkel %s\n"
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "N�kkel tilgjengelig ved: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra �%s�"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utg�tt signatur fra �%s�"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra �%s�"
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka �%s�"
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utg�tt %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utg�r %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "bin�r"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -5059,80 +4956,85 @@ msgstr "fstat(%d) mislyktes in %s: %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell offentlig n�kkel-algoritme %s\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "vennligst se %s for mer informasjon\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg �%s�\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
@@ -5874,11 +5776,11 @@ msgstr ""
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s-signatur fra: �%s�\n"
 
-#: g10/sign.c:758
+#: g10/sign.c:760
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5886,15 +5788,15 @@ msgstr ""
 "ADVARSEL: p�tvinging av kompresjonsalgoritme %s (%d) bryter med mottakerens "
 "preferanser\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -6208,7 +6110,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
@@ -6236,32 +6138,32 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6397,12 +6299,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
@@ -6463,11 +6365,11 @@ msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "feil ved henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent l�st!\n"
 
@@ -6574,12 +6476,12 @@ msgstr "kortet st�tter ikke digestalgoritme %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet s� langt: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 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:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
@@ -6588,7 +6490,7 @@ msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "leser valg fra �%s�\n"
@@ -6648,21 +6550,21 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6671,11 +6573,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 msgid "shell"
 msgstr ""
 
@@ -6715,8 +6617,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
@@ -6849,61 +6751,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "generere et opphevingssertifikat"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "bekrefte en signatur"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "preferansen %s er duplisert\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "ugyldig sertifikat"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -6918,7 +6820,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7039,6 +6941,113 @@ msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (bare signering)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (2) Krypteringsn�kkel\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) DSA (bare signering)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (bare signering)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (bare kryptering)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+msgid "No subject name given\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "ugyldig hashalgoritme �%s�\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Epostadresse: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Tast inn brukeriden.  Avslutt med en blank linje: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Tast inn nytt filnavn"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr ""
+"\n"
+"Tast inn brukeriden.  Avslutt med en blank linje: "
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "Tast inn PIN: "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7072,203 +7081,203 @@ msgstr "preferansen %s er duplisert\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adressater\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "liste hemmelige n�kler"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "endre passfrasen"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "lage ASCII-beskyttet output"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "sjekke signaturer"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "hent n�klene fra dette n�kkelknippet"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "ukjent kryptoalgoritme"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "ukjent kompresjonsalgoritme"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7279,36 +7288,36 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7415,7 +7424,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7434,31 +7443,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Signatur opprettet %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "God signatur fra �%s�"
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                aka �%s�"
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Dette vil v�re en selvsignatur.\n"
@@ -7914,6 +7923,90 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "ikke st�ttet"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "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 signerer en brukerid p� en n�kkel, b�r du f�rst bekrefte at\n"
+#~ "n�kkelen tilh�rer den personen som er angitt i brukeriden.  Det er\n"
+#~ "nyttig for andre � vite hvor n�yaktig du bekreftet dette.\n"
+#~ "\n"
+#~ "\"0\" betyr at du forteller hvor n�ye du bekreftet n�kkelen.\n"
+#~ "\n"
+#~ "\"1\" betyr at du tror at n�kkelen eies av den personen som p�st�r � eie\n"
+#~ "    n�kkelen, men du kunne ikke eller bekreftet ikke n�kkelen i det hele\n"
+#~ "    tatt.  Dette er nyttig for en identitetskontroll hvor du signerer\n"
+#~ "    n�kkelen til et pseudonym.\n"
+#~ "\n"
+#~ "\"2\" betyr at du gjorde en vanlig bekreftelse av n�kkelen.  For "
+#~ "eksempel,\n"
+#~ "    dette kunne bety at du bekreftet n�kkelens fingeravtrykk og sjekket\n"
+#~ "    brukeriden mot et fotografisk id.\n"
+#~ "\n"
+#~ "\"3\" betyr at du gjorde en utfyllende bekreftelse av n�kkelen.  For\n"
+#~ "    eksempel, dette kunne bety at du og eieren av n�kkelen bekreftet\n"
+#~ "    personlig n�kkelens fingeravtrykk og at du sjekket ved hjelp av et\n"
+#~ "    dokument med fotografi som er vanskelig � forfalske at navnet p�\n"
+#~ "    n�kkeleieren stemmer med navnet i brukeriden til n�kkelen og til "
+#~ "slutt\n"
+#~ "    at du bekreftet at epostadressen i n�kkelen tilh�rer n�kkelens eier.\n"
+#~ "\n"
+#~ "V�r obs p� at eksemplene gitt over for niv�ene 2 og 3 *bare* er\n"
+#~ "eksempler.  Alt i alt er det opp til deg � bestemme hva �vanlig� og\n"
+#~ "�utfyllende� betyr n�r du signerer andres n�kler.\n"
+#~ "\n"
+#~ "Svar �0� dersom du ikke vet hva det riktige svaret er."
+
 #, fuzzy
 #~ msgid ""
 #~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
@@ -8048,9 +8141,6 @@ msgstr "ikke st�ttet"
 #~ msgid "Enter Admin PIN: "
 #~ msgstr "Tast inn Admin-PIN: "
 
-#~ msgid "Enter PIN: "
-#~ msgstr "Tast inn PIN: "
-
 #, fuzzy
 #~ msgid "         algorithms on these user IDs:\n"
 #~ msgstr "                nye brukerider: %lu\n"
@@ -8061,9 +8151,6 @@ msgstr "ikke st�ttet"
 #~ msgid "unknown packet type"
 #~ msgstr "ukjent pakketype"
 
-#~ msgid "unknown version"
-#~ msgstr "ukjent versjon"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "ukjent pubkey-algoritme"
 
@@ -8163,9 +8250,6 @@ msgstr "ikke st�ttet"
 #~ msgid "network error"
 #~ msgstr "nettverksfeil"
 
-#~ msgid "not encrypted"
-#~ msgstr "ikke kryptert"
-
 #~ msgid "not processed"
 #~ msgstr "ikke behandlet"
 
diff --git a/po/pl.po b/po/pl.po
index a16f1f38c..922da8378 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.7\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+0100\n"
 "PO-Revision-Date: 2007-11-26 19:01+0100\n"
 "Last-Translator: Jakub Bogusz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -44,46 +44,46 @@ msgstr ""
 msgid "Quality:"
 msgstr "poprawno��: %s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (pr�ba %d z %d)"
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 msgid "PIN too long"
 msgstr "PIN zbyt d�ugi"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 msgid "Passphrase too long"
 msgstr "Has�o zbyt d�ugie"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 msgid "Invalid characters in PIN"
 msgstr "Niew�a�ciwy znak w PIN-ie"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr "PIN zbyt kr�tki"
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 msgid "Bad PIN"
 msgstr "Niepoprawny PIN"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 msgid "Bad Passphrase"
 msgstr "Niepoprawne has�o"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 msgid "Passphrase"
 msgstr "Has�o"
 
@@ -92,21 +92,21 @@ msgstr "Has�o"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "klucze ssh wi�ksze ni� %d bit�w nie s� obs�ugiwane\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -187,8 +187,8 @@ msgstr "PIN nie powt�rzony poprawnie; spr�buj jeszcze raz"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Prosz� wprowadzi� PIN%s%s%s aby odblokowa� kart�"
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "b��d tworzenia pliku tymczasowego: %s\n"
@@ -280,7 +280,7 @@ msgid "Please enter the new passphrase"
 msgstr "Prosz� wprowadzi� nowe has�o"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -297,13 +297,13 @@ msgid "run in daemon mode (background)"
 msgstr "uruchomienie w trybie demona (w tle)"
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�w"
 
@@ -380,8 +380,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|PLIK|zapis ustawie� �rodowiska tak�e do PLIKU"
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "B��dy prosimy zg�asza� na adres <"
 
@@ -397,29 +397,30 @@ msgstr ""
 "Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
 "Zarz�dzanie kluczem tajnym dla GnuPG\n"
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
@@ -529,12 +530,12 @@ msgstr "%s %s zatrzymany\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "brak dzia�aj�cego gpg-agenta w tej sesji\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -606,7 +607,7 @@ msgstr "anulowano\n"
 msgid "error opening `%s': %s\n"
 msgstr "b��d podczas otwierania ,,%s'': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "plik ,,%s'', linia %d: %s\n"
@@ -631,7 +632,7 @@ msgstr "b��dny odcisk w ,,%s'', w linii %d\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "nieprawid�owa flaga klucza w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "b��d odczytu ,,%s'', w linii %d: %s\n"
@@ -856,6 +857,147 @@ msgstr "brak miejsca w bezpiecznej pami�ci podczas przydzielania %lu bajt�w"
 msgid "out of core while allocating %lu bytes"
 msgstr "brak miejsca podczas przydzielania %lu bajt�w"
 
+#: common/asshelp.c:242
+#, fuzzy
+msgid "no running gpg-agent - starting one\n"
+msgstr "dirmngr nie dzia�a - uruchamianie ,,%s''\n"
+
+#: common/asshelp.c:347
+#, fuzzy
+msgid "can't connect to the agent - trying fall back\n"
+msgstr "nie mo�na po��czy� si� z dirmngr - pr�ba fallbacku\n"
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "�a�cuch certyfikat�w zbyt d�ugi\n"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "certyfikat g��wny jest dobry\n"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "wypisanie wszystkich dost�pnych danych"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: zbi�r kluczy utworzony\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "poprawno��: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Obs�ugiwane algorytmy:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "(to nie wygl�da na zaszyfrowan� wiadomo��)\n"
+
+#: common/audit.c:740
+#, fuzzy
+msgid "Number of recipients"
+msgstr "Aktualni odbiorcy:\n"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Podpisano w "
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "nie znaleziono podpisu\n"
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Podpisano w "
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "certyfikat jeszcze nie jest wa�ny"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "certyfikat g��wny jest dobry\n"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "nie znaleziono CRL dla certyfikatu"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "eksport certyfikat�w"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "nieznana opcja ,,%s''\n"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Brak pomocy o ,,%s''"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "b��d w linii ko�cz�cej\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -975,13 +1117,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "Wykryto kart� OpenPGP nr %s\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
@@ -1148,7 +1290,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Klucz do uwierzytelniania\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
@@ -1252,18 +1394,18 @@ msgstr "Niepoprawne polecenie  (spr�buj ,,help'')\n"
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1303,7 +1445,7 @@ msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nale�y najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -1323,7 +1465,7 @@ msgstr "szyfrem %s\n"
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
@@ -1352,7 +1494,7 @@ msgstr ""
 "OSTRZE�ENIE: wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami "
 "adresata\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1381,18 +1523,18 @@ msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "problem podczas obr�bki pakietu szyfrowego\n"
 
@@ -1535,7 +1677,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 %s.\n"
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %s - pomini�ty\n"
@@ -1550,7 +1692,7 @@ msgstr "u�ywany jest podklucz %s zamiast klucza g��wnego %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %s: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1566,27 +1708,27 @@ msgstr "|[plik]|z�o�enie podpisu"
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "lista kluczy"
 
@@ -1598,11 +1740,11 @@ msgstr "lista kluczy i podpis�w"
 msgid "list and check key signatures"
 msgstr "wypisanie i sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
@@ -1638,11 +1780,11 @@ msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
@@ -1678,11 +1820,11 @@ msgstr "uaktualnienie bazy zaufania"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1693,32 +1835,32 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
@@ -1734,7 +1876,7 @@ msgstr "�cis�e zachowanie OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "generowanie wiadomo�ci zgodnych z PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1742,7 +1884,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1782,7 +1924,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1802,11 +1944,11 @@ msgstr "Symetryczne: "
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1814,7 +1956,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
@@ -1900,458 +2042,458 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego "
 "rozszerzenie ,,%s''\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr "wy�wietlenie ID zdj�� przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr "pokazywanie URL-i polityk przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 msgid "show all notations during signature listings"
 msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr "pokazywanie adnotacji u�ytkownika przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "pokazywanie URL-i preferowanych serwer�w kluczy przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika na listach kluczy"
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr "pokazywanie uniewa�nionych i wygas�ych podkluczy na listach kluczy"
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 msgid "show the keyring name in key listings"
 msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wyga�ni�cia przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "biblioteka libgcrypt jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr ",,%s'' nie jest poprawnym czasem wyga�ni�cia podpisu\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumia�y URL serwera kluczy\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika przy sprawdzaniu "
 "podpis�w"
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr "sprawdzanie podpis�w z danymi PKA"
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, 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:2782
+#: g10/gpg.c:2821
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nie zadzia�a z niebezpieczn� pami�ci� z powodu %s\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [plik]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [plik]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
 
@@ -2363,7 +2505,7 @@ msgstr "pobieranie kluczy z tego zbioru"
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktowa� konfliktu datownik�w jako b��du"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
@@ -2379,333 +2521,11 @@ msgstr ""
 "Sk�adnia: gpg [opcje] [pliki]\n"
 "Sprawdzanie podpis�w ze znanych zaufanych kluczy\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Te warto�ci u�ytkownik przydziela wg swojego uznania; nie b�d� nigdy\n"
-"eksportowane poza ten system. Potrzebne s� one do zbudowania sieci\n"
-"zaufania, i nie ma to nic wsp�lnego z tworzon� automatycznie sieci�\n"
-"certyfikat�w."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Aby zbudowa� Sie� Zaufania, GnuPG potrzebuje zna� klucze do kt�rych\n"
-"masz absolutne zaufanie. Zwykle s� to klucze do kt�rych masz klucze\n"
-"tajne. Odpowiedz ,,tak'', je�li chcesz okre�li� ten klucz jako klucz\n"
-"do kt�rego masz absolutne zaufanie.\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Je�li mimo wszystko chcesz u�y� tego klucza, klucza, co do kt�rego nie ma\n"
-"�adnej pewno�ci do kogo nale�y, odpowiedz ,,tak''."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Podaj adresat�w tej wiadomo�ci."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"Prosz� wybra� algorytm.\n"
-"\n"
-"DSA (znany tak�e jako DSS) to algorytm podpisu cyfrowego (Digital Signature\n"
-"Algorithm) i mo�e by� u�ywany tylko do podpis�w.\n"
-"\n"
-"Elgamal to algorytm tylko do szyfrowania.\n"
-"\n"
-"RSA mo�e by� u�ywany do podpis�w lub szyfrowania.\n"
-"\n"
-"Pierwszy (g��wny) klucz zawsze musi by� kluczem nadaj�cym si� do "
-"podpisywania."
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"U�ywanie tego samego klucza do podpisywania i szyfrowania nie jest dobrym\n"
-"pomys�em. Mo�na tak post�powa� tylko w niekt�rych zastosowaniach. Prosz� "
-"si�\n"
-"najpierw skonsultowa� z ekspertem od bezpiecze�stwa. "
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Wprowad� rozmiar klucza"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Odpowiedz \"tak\" lub \"nie\"."
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Wprowad� ��dan� warto�� (jak w znaku zach�ty).\n"
-"Mo�na tu poda� dat� w formacie ISO (RRRR-MM-DD) ale nie da to\n"
-"w�a�ciwej obs�ugi b��d�w - system pr�buje interpretowa� podan� warto��\n"
-"jako okres."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Nazwa w�a�ciciela klucza."
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "prosz� wprowadzi� opcjonalny ale wysoce doradzany adres e-mail"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Prosz� wprowadzi� opcjonalny komentarz"
-
-# OSTRZE�ENIE: nic nie zosta�o wyeksportowane!
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N aby zmieni� nazw� (nazwisko).\n"
-"C aby zmieni� komentarz.<\n"
-"E aby zmieni� adres e-mail.\n"
-"O aby kontynuowa� tworzenie klucza.\n"
-"Q aby zrezygnowa� z tworzenia klucza."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Je�li ma zosta� wygenerowany podklucz, nale�y odpowiedzie� \"tak\"."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Przy podpisywaniu identyfikatora u�ytkownika na kluczu nale�y sprawdzi�,\n"
-"czy to�samo�� u�ytkownika odpowiada temu, co jest wpisane w "
-"identyfikatorze.\n"
-"Innym u�ytkownikom przyda si� informacja, jak dog��bnie zosta�o to przez\n"
-"Ciebie sprawdzone.\n"
-"\n"
-"\"0\" oznacza, �e nie podajesz �adnych informacji na temat tego jak "
-"dog��bnie\n"
-"    to�samo�� u�ytkownika zosta�a przez Ciebie potwierdzona.\n"
-"\n"
-"\"1\" oznacza, �e masz przekonanie, �e to�samo�� u�ytkownika odpowiada\n"
-"    identyfikatorowi klucza, ale nie by�o mo�liwo�ci sprawdzenia tego.\n"
-"    Taka sytuacja wyst�puje te� kiedy podpisujesz identyfikator b�d�cy\n"
-"    pseudonimem.\n"
-"\n"
-"\"2\" oznacza, �e to�samo�� u�ytkownika zosta�a przez Ciebie potwierdzona\n"
-"    pobie�nie - sprawdzili�cie odcisk klucza, sprawdzi�a�/e� to�samo��\n"
-"    na okazanym dokumencie ze zdj�ciem.\n"
-"\n"
-"\"3\" to dog��bna weryfikacja to�samo�ci. Na przyk�ad sprawdzenie odcisku\n"
-"    klucza, sprawdzenie to�samo�ci z okazanego oficjalnego dokumentu ze\n"
-"    zdj�ciem (np paszportu) i weryfikacja poprawno�ci adresu poczty\n"
-"    elektronicznej przez wymian� poczty z tym adresem.\n"
-"\n"
-"Zauwa�, �e podane powy�ej przyk�ady dla poziom�w \"2\" i \"3\" to *tylko*\n"
-"przyk�ady. Do Ciebie nale�y decyzja co oznacza \"pobie�ny\" i \"dog��bny\" "
-"w\n"
-"kontek�cie po�wiadczania i podpisywania kluczy.\n"
-"\n"
-"Je�li nie wiesz co odpowiedzie�, podaj \"0\"."
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Odpowiedz \"tak\", aby podpisa� WSZYSTKIE identyfikatory u�ytkownika."
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Aby skasowa� ten identyfikator u�ytkownika (co wi��e si� ze utrat�\n"
-"wszystkich jego po�wiadcze�!) nale�y odpowiedzie� ,,tak''."
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Aby skasowa� podklucz nale�y odpowiedzie� \"tak\"."
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"To jest poprawny podpis na tym kluczu; normalnie nie nale�y go usuwa�\n"
-"poniewa� mo�e by� wa�ny dla zestawienia po��czenia zaufania do klucza\n"
-"kt�rym go z�o�ono lub do innego klucza nim po�wiadczonego."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Ten podpis nie mo�e zosta� potwierdzony poniewa� nie ma\n"
-"odpowiadaj�cego mu klucza publicznego. Nale�y od�o�y� usuni�cie tego\n"
-"podpisu do czasu, kiedy oka�e si� kt�ry klucz zosta� u�yty, poniewa�\n"
-"w momencie uzyskania tego klucza mo�e pojawi� si� �cie�ka zaufania\n"
-"pomi�dzy tym a innym, ju� po�wiadczonym kluczem."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "Ten podpis jest niepoprawny. Mo�na usun�� go ze zbioru kluczy."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"To jest podpis wi���cy identyfikator u�ytkownika z kluczem. Nie nale�y\n"
-"go usuwa� - GnuPG mo�e nie m�c pos�ugiwa� si� dalej kluczem bez\n"
-"takiego podpisu. Bezpiecznie mo�na go usun�� tylko je�li ten podpis\n"
-"klucza nim samym z jakich� przyczyn nie jest poprawny, i klucz jest\n"
-"drugi raz podpisany w ten sam spos�b."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Przestawienie wszystkich (lub tylko wybranych) identyfikator�w na aktualne\n"
-"ustawienia. Data na odpowiednich podpisach zostane przesuni�ta do przodu o\n"
-"jedn� sekund�.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Prosz� powt�rzy� has�o, aby upewni� si� �e nie by�o pomy�ki."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Podaj nazw� pliku kt�rego dotyczy ten podpis"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Je�li mo�na nadpisa� ten plik, nale�y odpowiedzie� ,,tak''"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Nazwa pliku. Naci�ni�cie ENTER potwierdzi nazw� domy�ln� (w nawiasach)."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Nalezy poda� pow�d uniewa�nienia klucza. W zale�no�ci od kontekstu mo�na\n"
-"go wybra� z listy:\n"
-"  \"Klucz zosta� skompromitowany\"\n"
-"      Masz powody uwa�a� �e tw�j klucz tajny dosta� si� w niepowo�ane r�ce.\n"
-"  \"Klucz zosta� zast�piony\"\n"
-"      Klucz zosta� zast�piony nowym.\n"
-"  \"Klucz nie jest ju� u�ywany\"\n"
-"      Klucz zosta� wycofany z u�ycia.\n"
-"  \"Identyfikator u�ytkownika przesta� by� poprawny\"\n"
-"      Identyfikator u�ytkownika (najcz�ciej adres e-mail przesta� by�\n"
-"      poprawny.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Je�li chcesz, mo�esz poda� opis powodu wystawienia certyfikatu\n"
-"uniewa�nienia. Opis powinien byc zwi�z�y.\n"
-"Pusta linia ko�czy wprowadzanie tekstu.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Pomoc niedost�pna"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o ,,%s''"
@@ -2900,13 +2720,13 @@ msgstr "klucz %s: nowy klucz - pomini�ty\n"
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do ,,%s''\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy ,,%s'': %s\n"
@@ -2995,7 +2815,7 @@ msgstr "klucz %s: klucz tajny z b��dnym szyfrem %d - pomini�ty\n"
 msgid "importing secret keys not allowed\n"
 msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lnego zbioru kluczy tajnych: %s\n"
@@ -3460,8 +3280,8 @@ msgstr "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
@@ -3471,19 +3291,19 @@ msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Klucz ma tylko za�lepk� albo elementy na karcie - nie ma has�a do zmiany.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Cz�� tajna g��wnego klucza jest zapisana na karcie.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
@@ -3500,7 +3320,7 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
@@ -3851,91 +3671,91 @@ msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 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:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "no-modify dla serwera kluczy"
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Preferowany serwer kluczy: "
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 msgid "Notations: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ten klucz zosta� uniewa�niony %s przez klucz %s u�ytkownika %s\n"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2720
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s u�ytkownika %s"
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr "(poufne)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "utworzono: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "uniewa�niono: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "wygas�: %s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "wygasa: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "u�ycie: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "zaufanie: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "poprawno��: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr "nr-karty: "
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3943,17 +3763,17 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "uniewa�niony"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "wygas�"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -3962,7 +3782,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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3971,74 +3791,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' upakowany: %s\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': %d podpis�w wyczyszczonych\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': ju� zmniejszony.\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': ju� czysty.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4048,191 +3868,191 @@ msgstr ""
 "             uniewa�niaj�cego spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczy� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:3448
+#: g10/keyedit.c:3449
 msgid "this key has already been designated as a revoker\n"
 msgstr "ten klucz zosta� ju� uznany kluczem uniewa�niaj�cym\n"
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podklucz podpisuj�cy %s jest ju� skro�nie podpisany\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "podklucz %s nie jest podpisuj�cy, wi�c nie musi by� skro�nie podpisany\n"
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "Podaj preferowany URL serwera kluczy: "
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz go zast�pi�? (t/N) "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz go usun��? (t/N) "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 msgid "Enter the notation: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 msgid "Proceed? (y/N) "
 msgstr "Kontynuowa�? (t/N) "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o skr�cie %s\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d.\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identyfikator u�ytkownika: ,,%s''\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany twoim kluczem %s w %s%s%s\n"
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory na kluczu %s s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (podpis nieuniewa�nialny) "
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez tw�j klucz %s w %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klucz %s jest ju� uniewa�niony.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklucz %s jest ju� uniewa�niony.\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4274,12 +4094,12 @@ msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmiar klucza zaokr�glony w g�r� do %u bit�w\n"
@@ -4307,109 +4127,119 @@ msgstr "Szyfrowanie"
 msgid "Authenticate"
 msgstr "Uwierzytelnianie"
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "PpSsUuZz"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Mo�liwe akcje dla klucza %s: "
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "Aktualnie dopuszczalne akcje: "
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Prze��czenie mo�liwo�ci podpisywania\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Prze��czenie mo�liwo�ci szyfrowania\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Prze��czenie mo�liwo�ci uwierzytelniania\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Zako�czenie\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytm�w DSA i Elgamala (domy�lne)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (mo�liwo�ci do ustawienia)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu Elgamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (mo�liwo�ci do ustawienia)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Para kluczy DSA b�dzie mia�a %u bit�w d�ugo�ci.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "Klucze %s b�d� mia�y od %u do %u bit�w d�ugo�ci.\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (%u) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "Rozmiary kluczy %s musz� by� z przedzia�u %u-%u\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4425,7 +4255,7 @@ msgstr ""
 "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4441,38 +4271,38 @@ msgstr ""
 "      <n>m = termin wa�no�ci podpisu up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci podpisu up�ywa za n lat\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres wa�no�ci podpisu? (%s) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie wyga�nie w og�le\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "Podpis nie wyga�nie w og�le\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Klucz traci wa�no�� %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Wa�no�� podpisu wygasa %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4480,11 +4310,11 @@ msgstr ""
 "Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
 "Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/N)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4500,44 +4330,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� co najmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4548,7 +4378,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie nale�y umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
@@ -4565,25 +4395,25 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
 "czy (W)yj�� z programu? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4591,12 +4421,12 @@ msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4608,7 +4438,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4624,50 +4454,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w ,,%s''\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� za�lepk� klucza tajnego w ,,%s''\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w ,,%s''\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 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"
@@ -4675,12 +4505,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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4688,7 +4518,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4696,26 +4526,26 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? (t/N) "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zapis klucza na karcie nie powi�d� si�: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� pliku kopii zapasowej ,,%s'': %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
@@ -5017,192 +4847,192 @@ msgstr "has�o wygenerowane nieznanym algorytmem skr�tu %d\n"
 msgid "public key is %s\n"
 msgstr "klucz publiczny to %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "zaszyfrowano %u-bitowym kluczem %s o identyfikatorze %s, stworzonym %s\n"
 
-#: g10/mainproc.c:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ,,%s''\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s o identyfikatorze %s\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomoc� %lu hase�\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym has�em\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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 niego\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "OSTRZE�ENIE: widziano wiele czystych tekst�w\n"
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 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:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 msgid "no signature found\n"
 msgstr "nie znaleziono podpisu\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nie mo�na obs�u�y� tych wieloznacznych danych podpisu\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpisano w %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               przy u�yciu klucza %s %s\n"
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpisano w %s kluczem %s o numerze %s\n"
 
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez ,,%s''"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis z�o�ony przez ,,%s''"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis z�o�ony przez ,,%s''"
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias ,,%s''"
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -5222,81 +5052,86 @@ msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr ""
 "OSTRZE�ENIE: u�ycie eksperymentalnego algorytmu klucza publicznego %s\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "OSTRZE�ENIE: algorytm skr�tu %s jest odradzany\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "OSTRZE�ENIE: u�ycie eksperymentalnego szyfru %s\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "OSTRZE�ENIE: u�ycie eksperymentalnego algorytmu skr�tu %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "OSTRZE�ENIE: algorytm skr�tu %s jest odradzany\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "obja�nienie mo�na przeczyta� tutaj: %s\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "OSTRZE�ENIE: ,,%s'' jest przestarza�ym poleceniem - nie nale�y go u�ywa�\n"
 
-#: g10/misc.c:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: przestarza�a opcja ,,%s'' - nie ma efektu\n"
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj� - nie ma efektu\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr "nieskompresowany|brak"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "niejednoznaczna opcja ,,%s''\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
@@ -6065,13 +5900,13 @@ msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "podpis %s/%s z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6079,15 +5914,15 @@ msgstr ""
 "OSTRZE�ENIE: wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami "
 "adresata\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
@@ -6409,7 +6244,7 @@ msgstr "absolutne"
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
@@ -6437,26 +6272,26 @@ msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %s nie odnaleziony\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "potrzeba %d marginalnych, %d pe�nych, model zaufania %s\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6464,7 +6299,7 @@ msgstr ""
 "poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,%"
 "du\n"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6598,12 +6433,12 @@ msgstr ""
 "Sk�adnia: kbxutil [opcje] [pliki]\n"
 "wypisywanie, eksport, import danych Keybox\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Zapytanie zwrotne o PIN zwr�ci�o b��d: %s\n"
@@ -6665,11 +6500,11 @@ msgstr "weryfikacja CHV%d nie powiod�a si�: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "dost�p do polece� administratora nie zosta� skonfigurowany\n"
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "b��d podczas odczytu stanu CHV z karty\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "karta zosta�a trwale zablokowana!\n"
 
@@ -6776,13 +6611,13 @@ msgstr "karta nie obs�uguje algorytmu skr�tu %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "dotychczas stworzono podpis�w: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "weryfikacja PIN-u administratora tym poleceniem jest aktualnie zabroniona\n"
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie mo�na dosta� si� do %s - niepoprawna karta OpenPGP?\n"
@@ -6791,7 +6626,7 @@ msgstr "nie mo�na dosta� si� do %s - niepoprawna karta OpenPGP?\n"
 msgid "run in multi server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 msgid "read options from file"
 msgstr "odczyt opcji z pliku"
 
@@ -6850,21 +6685,21 @@ msgstr "obs�uga fd %d zako�czona\n"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64 %02x zosta� pomini�ty\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "dirmngr nie dzia�a - uruchamianie ,,%s''\n"
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej DIRMNGR_INFO\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u dirmngr nie jest obs�ugiwana\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "nie mo�na po��czy� si� z dirmngr - pr�ba fallbacku\n"
 
@@ -6873,11 +6708,11 @@ msgstr "nie mo�na po��czy� si� z dirmngr - pr�ba fallbacku\n"
 msgid "validation model requested by certificate: %s"
 msgstr "model poprawno�ci ��dany przez certyfikat: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr "�a�cuchowy"
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 msgid "shell"
 msgstr "pow�okowy"
 
@@ -6916,8 +6751,8 @@ msgstr "poszukiwanie wystawcy na zewn�trz\n"
 msgid "number of issuers matching: %d\n"
 msgstr "liczba pasuj�cych wystawc�w: %d\n"
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "nie uda�o si� przydzieli� uchwytu keyDB\n"
 
@@ -7037,57 +6872,57 @@ msgstr "UWAGA: czas utworzenia podpisu nie jest znany - przyj�to czas bie��cy"
 msgid "no issuer found in certificate"
 msgstr "nie znaleziono wystawcy w certyfikacie"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr "w�asnor�cznie podpisany certyfikat ma Z�Y podpis"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr "g��wny certyfikat nie jest oznaczony jako zaufany"
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "sprawdzenie listy zaufania nie powiod�o si�: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "�a�cuch certyfikat�w zbyt d�ugi\n"
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr "nie znaleziono wystawcy certyfikatu"
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 msgid "certificate has a BAD signature"
 msgstr "certyfikat ma Z�Y podpis"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr "znaleziono inny by� mo�e pasuj�cy certyfikat CA - ponawianie pr�by"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "�a�cuch certyfikat�w d�u�szy ni� zezwala CA (%d)"
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 msgid "certificate is good\n"
 msgstr "certyfikat jest dobry\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 msgid "intermediate certificate is good\n"
 msgstr "certyfikat po�redni jest dobry\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 msgid "root certificate is good\n"
 msgstr "certyfikat g��wny jest dobry\n"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr "prze��czanie do modelu �a�cuchowego"
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr "u�yty model poprawno�ci: %s"
@@ -7102,7 +6937,7 @@ msgstr "Klucz %s u�ywa niebezpiecznego (%u-bitowego) skr�tu\n"
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "skr�t %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(to jest algorytm MD2)\n"
 
@@ -7220,6 +7055,111 @@ msgstr "linia %d: b��d pobierania klucza z uchwytu ,,%s'': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "linia %d: generowanie klucza nie powiod�o si�: %s <%s>\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (tylko do podpisywania)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (2) Klucz do szyfrowania\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, fuzzy, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "Mo�liwe akcje dla klucza %s: "
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) DSA (tylko do podpisywania)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (tylko do podpisywania)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (tylko do szyfrowania)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "linia %d: nie podano nazwy przedmiotu\n"
+
+#: sm/certreqgen-ui.c:211
+#, fuzzy, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr "linia %d: niew�a�ciwa etykieta nazwy przedmiotu ,,%.*s''\n"
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "linia %d: niew�a�ciwa etykieta nazwy przedmiotu ,,%.*s''\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Adres poczty elektronicznej: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Identyfikator u�ytkownika (pusta linia oznacza koniec): "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Nazwa pliku"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Wprowad� opis (nieobowi�zkowy) i zako�cz go pust� lini�:\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(to jest algorytm RC2)\n"
@@ -7253,185 +7193,185 @@ msgstr "certyfikat ,,%s'' usuni�ty\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "usuni�cie certyfikatu ,,%s'' nie powiod�o si�: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 msgid "no valid recipients given\n"
 msgstr "nie podano poprawnych adresat�w\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 msgid "|[FILE]|make a signature"
 msgstr "|[PLIK]|z�o�enie podpisu"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[PLIK]|z�o�enie podpisu z zachowaniem czytelno�ci dokumentu"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 msgid "list external keys"
 msgstr "wypisanie kluczy zewn�trznych"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 msgid "list certificate chain"
 msgstr "wypisanie �a�cucha certyfikat�w"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 msgid "import certificates"
 msgstr "import certyfikat�w"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 msgid "export certificates"
 msgstr "eksport certyfikat�w"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr "zarejestrowanie karty procesorowej"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr "przekazanie polecenia do dirmngr"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr "wywo�anie gpg-protect-tool"
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 msgid "change a passphrase"
 msgstr "zmiana has�a"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 msgid "create base-64 encoded output"
 msgstr "tworzenie wyj�cia zakodowanego base-64"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr "przyj�cie wej�cia w formacie PEM"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr "przyj�cie wej�cia w formacie base-64"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr "przyj�cie wej�cia w formacie binarnym"
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr "u�ycie systemowego dirmngr je�li jest dost�pny"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr "pomini�cie CRL"
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr "sprawdzenie poprawno�ci przy u�yciu OCSP"
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr "|N|liczba certyfikat�w do do��czenia"
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr "nie sprawdzanie polityk certyfikat�w"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr "pobranie brakuj�cych certyfikat�w wystawc�w"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego adresata"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "u�ycie domy�lnego klucza jako domy�lnego adresata"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "nie u�ywanie w og�le terminala"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 #, fuzzy
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "wymuszenie podpis�w v3"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "u�ywanie zawsze MDC do szyfrowania"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: bez �adnych pyta�"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "przyj�cie odpowiedzi ,,tak'' na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "przyj�cie odpowiedzi ,,nie'' na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "dodanie tego zbioru kluczy do listy zbior�w kluczy"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "dodanie tego zbioru kluczy tajnych do listy"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego klucza tajnego"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|u�ycie tego serwera do wyszukiwania kluczy"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|ustawienie zestawu znak�w terminala"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|wczytanie modu�u rozszerzenia PLIK"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|u�ycie tego algorytmu szyfrowania NAZWA"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|u�ycie tego algorytmu skr�tu wiadomo�ci"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|u�ycie algorytmu kompresji N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgsm [opcje] [pliki] (-h podaje pomoc)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7442,35 +7382,35 @@ msgstr ""
 "MIME\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 msgid "usage: gpgsm [options] "
 msgstr "wywo�anie: gpgsm [opcje]"
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "UWAGA: nie mo�na zaszyfrowa� do ,,%s'': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nieznany model poprawno�ci ,,%s''\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "import wsp�lnych certyfikat�w ,,%s''\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na podpisa� z u�yciem ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr "to polecenie nie zosta�o jeszcze zaimplementowane\n"
 
@@ -7581,7 +7521,7 @@ msgstr ""
 "\n"
 "%s%sNa pewno chcesz to zrobi�?"
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7605,28 +7545,28 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiod�o si�: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 msgid "Signature made "
 msgstr "Podpisano w "
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr "[nie podano daty]"
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr " przy u�yciu certyfikatu o ID 0x%08lX\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 msgid "Good signature from"
 msgstr "Poprawny podpis z�o�ony przez"
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 msgid "                aka"
 msgstr "                        alias"
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 msgid "This is a qualified signature\n"
 msgstr "To jest podpis kwalifikowany\n"
 
@@ -8074,6 +8014,325 @@ msgstr "nie podano klasy\n"
 msgid "class %s is not supported\n"
 msgstr "klasa %s nie jest obs�ugiwana\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Wywo�anie: gpg-connect-agent [opcje] (-h podaje pomoc)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Te warto�ci u�ytkownik przydziela wg swojego uznania; nie b�d� nigdy\n"
+#~ "eksportowane poza ten system. Potrzebne s� one do zbudowania sieci\n"
+#~ "zaufania, i nie ma to nic wsp�lnego z tworzon� automatycznie sieci�\n"
+#~ "certyfikat�w."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Aby zbudowa� Sie� Zaufania, GnuPG potrzebuje zna� klucze do kt�rych\n"
+#~ "masz absolutne zaufanie. Zwykle s� to klucze do kt�rych masz klucze\n"
+#~ "tajne. Odpowiedz ,,tak'', je�li chcesz okre�li� ten klucz jako klucz\n"
+#~ "do kt�rego masz absolutne zaufanie.\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Je�li mimo wszystko chcesz u�y� tego klucza, klucza, co do kt�rego nie "
+#~ "ma\n"
+#~ "�adnej pewno�ci do kogo nale�y, odpowiedz ,,tak''."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "Podaj adresat�w tej wiadomo�ci."
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "Prosz� wybra� algorytm.\n"
+#~ "\n"
+#~ "DSA (znany tak�e jako DSS) to algorytm podpisu cyfrowego (Digital "
+#~ "Signature\n"
+#~ "Algorithm) i mo�e by� u�ywany tylko do podpis�w.\n"
+#~ "\n"
+#~ "Elgamal to algorytm tylko do szyfrowania.\n"
+#~ "\n"
+#~ "RSA mo�e by� u�ywany do podpis�w lub szyfrowania.\n"
+#~ "\n"
+#~ "Pierwszy (g��wny) klucz zawsze musi by� kluczem nadaj�cym si� do "
+#~ "podpisywania."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "U�ywanie tego samego klucza do podpisywania i szyfrowania nie jest "
+#~ "dobrym\n"
+#~ "pomys�em. Mo�na tak post�powa� tylko w niekt�rych zastosowaniach. Prosz� "
+#~ "si�\n"
+#~ "najpierw skonsultowa� z ekspertem od bezpiecze�stwa. "
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Wprowad� rozmiar klucza"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Odpowiedz \"tak\" lub \"nie\"."
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Wprowad� ��dan� warto�� (jak w znaku zach�ty).\n"
+#~ "Mo�na tu poda� dat� w formacie ISO (RRRR-MM-DD) ale nie da to\n"
+#~ "w�a�ciwej obs�ugi b��d�w - system pr�buje interpretowa� podan� warto��\n"
+#~ "jako okres."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Nazwa w�a�ciciela klucza."
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "prosz� wprowadzi� opcjonalny ale wysoce doradzany adres e-mail"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Prosz� wprowadzi� opcjonalny komentarz"
+
+# OSTRZE�ENIE: nic nie zosta�o wyeksportowane!
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N aby zmieni� nazw� (nazwisko).\n"
+#~ "C aby zmieni� komentarz.<\n"
+#~ "E aby zmieni� adres e-mail.\n"
+#~ "O aby kontynuowa� tworzenie klucza.\n"
+#~ "Q aby zrezygnowa� z tworzenia klucza."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Je�li ma zosta� wygenerowany podklucz, nale�y odpowiedzie� \"tak\"."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Przy podpisywaniu identyfikatora u�ytkownika na kluczu nale�y sprawdzi�,\n"
+#~ "czy to�samo�� u�ytkownika odpowiada temu, co jest wpisane w "
+#~ "identyfikatorze.\n"
+#~ "Innym u�ytkownikom przyda si� informacja, jak dog��bnie zosta�o to przez\n"
+#~ "Ciebie sprawdzone.\n"
+#~ "\n"
+#~ "\"0\" oznacza, �e nie podajesz �adnych informacji na temat tego jak "
+#~ "dog��bnie\n"
+#~ "    to�samo�� u�ytkownika zosta�a przez Ciebie potwierdzona.\n"
+#~ "\n"
+#~ "\"1\" oznacza, �e masz przekonanie, �e to�samo�� u�ytkownika odpowiada\n"
+#~ "    identyfikatorowi klucza, ale nie by�o mo�liwo�ci sprawdzenia tego.\n"
+#~ "    Taka sytuacja wyst�puje te� kiedy podpisujesz identyfikator b�d�cy\n"
+#~ "    pseudonimem.\n"
+#~ "\n"
+#~ "\"2\" oznacza, �e to�samo�� u�ytkownika zosta�a przez Ciebie "
+#~ "potwierdzona\n"
+#~ "    pobie�nie - sprawdzili�cie odcisk klucza, sprawdzi�a�/e� to�samo��\n"
+#~ "    na okazanym dokumencie ze zdj�ciem.\n"
+#~ "\n"
+#~ "\"3\" to dog��bna weryfikacja to�samo�ci. Na przyk�ad sprawdzenie "
+#~ "odcisku\n"
+#~ "    klucza, sprawdzenie to�samo�ci z okazanego oficjalnego dokumentu ze\n"
+#~ "    zdj�ciem (np paszportu) i weryfikacja poprawno�ci adresu poczty\n"
+#~ "    elektronicznej przez wymian� poczty z tym adresem.\n"
+#~ "\n"
+#~ "Zauwa�, �e podane powy�ej przyk�ady dla poziom�w \"2\" i \"3\" to "
+#~ "*tylko*\n"
+#~ "przyk�ady. Do Ciebie nale�y decyzja co oznacza \"pobie�ny\" i \"dog��bny"
+#~ "\" w\n"
+#~ "kontek�cie po�wiadczania i podpisywania kluczy.\n"
+#~ "\n"
+#~ "Je�li nie wiesz co odpowiedzie�, podaj \"0\"."
+
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr ""
+#~ "Odpowiedz \"tak\", aby podpisa� WSZYSTKIE identyfikatory u�ytkownika."
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Aby skasowa� ten identyfikator u�ytkownika (co wi��e si� ze utrat�\n"
+#~ "wszystkich jego po�wiadcze�!) nale�y odpowiedzie� ,,tak''."
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Aby skasowa� podklucz nale�y odpowiedzie� \"tak\"."
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "To jest poprawny podpis na tym kluczu; normalnie nie nale�y go usuwa�\n"
+#~ "poniewa� mo�e by� wa�ny dla zestawienia po��czenia zaufania do klucza\n"
+#~ "kt�rym go z�o�ono lub do innego klucza nim po�wiadczonego."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Ten podpis nie mo�e zosta� potwierdzony poniewa� nie ma\n"
+#~ "odpowiadaj�cego mu klucza publicznego. Nale�y od�o�y� usuni�cie tego\n"
+#~ "podpisu do czasu, kiedy oka�e si� kt�ry klucz zosta� u�yty, poniewa�\n"
+#~ "w momencie uzyskania tego klucza mo�e pojawi� si� �cie�ka zaufania\n"
+#~ "pomi�dzy tym a innym, ju� po�wiadczonym kluczem."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr "Ten podpis jest niepoprawny. Mo�na usun�� go ze zbioru kluczy."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "To jest podpis wi���cy identyfikator u�ytkownika z kluczem. Nie nale�y\n"
+#~ "go usuwa� - GnuPG mo�e nie m�c pos�ugiwa� si� dalej kluczem bez\n"
+#~ "takiego podpisu. Bezpiecznie mo�na go usun�� tylko je�li ten podpis\n"
+#~ "klucza nim samym z jakich� przyczyn nie jest poprawny, i klucz jest\n"
+#~ "drugi raz podpisany w ten sam spos�b."
+
+#~ 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 ""
+#~ "Przestawienie wszystkich (lub tylko wybranych) identyfikator�w na "
+#~ "aktualne\n"
+#~ "ustawienia. Data na odpowiednich podpisach zostane przesuni�ta do przodu "
+#~ "o\n"
+#~ "jedn� sekund�.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "Prosz� powt�rzy� has�o, aby upewni� si� �e nie by�o pomy�ki."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Podaj nazw� pliku kt�rego dotyczy ten podpis"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Je�li mo�na nadpisa� ten plik, nale�y odpowiedzie� ,,tak''"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Nazwa pliku. Naci�ni�cie ENTER potwierdzi nazw� domy�ln� (w nawiasach)."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Nalezy poda� pow�d uniewa�nienia klucza. W zale�no�ci od kontekstu mo�na\n"
+#~ "go wybra� z listy:\n"
+#~ "  \"Klucz zosta� skompromitowany\"\n"
+#~ "      Masz powody uwa�a� �e tw�j klucz tajny dosta� si� w niepowo�ane "
+#~ "r�ce.\n"
+#~ "  \"Klucz zosta� zast�piony\"\n"
+#~ "      Klucz zosta� zast�piony nowym.\n"
+#~ "  \"Klucz nie jest ju� u�ywany\"\n"
+#~ "      Klucz zosta� wycofany z u�ycia.\n"
+#~ "  \"Identyfikator u�ytkownika przesta� by� poprawny\"\n"
+#~ "      Identyfikator u�ytkownika (najcz�ciej adres e-mail przesta� by�\n"
+#~ "      poprawny.\n"
+
+#~ 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 ""
+#~ "Je�li chcesz, mo�esz poda� opis powodu wystawienia certyfikatu\n"
+#~ "uniewa�nienia. Opis powinien byc zwi�z�y.\n"
+#~ "Pusta linia ko�czy wprowadzanie tekstu.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr ""
 #~ "nie mo�na umie�ci� adnotacji w podpisach sk�adanych kluczami PGP 2.x\n"
diff --git a/po/pt.po b/po/pt.po
index 7469f25de..b9c4e584f 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -41,51 +41,51 @@ msgstr "Por favor digite a frase secreta \n"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido no nome\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorrecta"
@@ -95,21 +95,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -191,8 +191,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -271,7 +271,7 @@ msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -290,13 +290,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
@@ -379,8 +379,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
@@ -396,29 +396,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
@@ -530,12 +531,12 @@ msgstr "%s: ignorado: %s\n"
 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:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -606,7 +607,7 @@ msgstr "cancelado pelo utilizador\n"
 msgid "error opening `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
@@ -631,7 +632,7 @@ msgstr "armadura: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -859,6 +860,144 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "certificado incorrecto"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "certificado incorrecto"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "Nenhuma ajuda dispon�vel"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: porta-chaves criado\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "armadura: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Algoritmos suportados:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "n�o cifrado"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "verifica��o de assinatura suprimida\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Esta assinatura expirou em %s.\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Assinatura correcta de \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Esta assinatura expirou em %s.\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Esta chave expirou!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "certificado incorrecto"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "certificado incorrecto"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "certificado incorrecto"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "vers�o desconhecida"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Nenhuma ajuda dispon�vel para `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "erro na �ltima linha\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -981,14 +1120,14 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Op��o? "
 
@@ -1167,7 +1306,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -1284,18 +1423,18 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1338,7 +1477,7 @@ msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -1357,7 +1496,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
@@ -1385,7 +1524,7 @@ msgid ""
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1415,18 +1554,18 @@ msgstr "%s/%s cifrado para: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao tratar pacote cifrado\n"
 
@@ -1574,7 +1713,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, 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"
@@ -1589,7 +1728,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1605,27 +1744,27 @@ msgstr "|[ficheiro]|fazer uma assinatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "listar as chaves"
 
@@ -1638,11 +1777,11 @@ msgstr "listar as chaves e as assinaturas"
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
@@ -1678,11 +1817,11 @@ msgstr "gerar um certificado de revoga��o"
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
@@ -1718,11 +1857,11 @@ msgstr "actualizar a base de dados de confian�a"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1733,36 +1872,36 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -1778,7 +1917,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1786,7 +1925,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1824,7 +1963,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1844,11 +1983,11 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1856,7 +1995,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
@@ -1927,468 +2066,468 @@ msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, 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:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, 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:2782
+#: g10/gpg.c:2821
 #, 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:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 #, 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:3048
+#: g10/gpg.c:3096
 #, 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:3051
+#: g10/gpg.c:3099
 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:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, 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:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 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:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -2403,7 +2542,7 @@ msgstr "Remover esta chave do porta-chaves?"
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
@@ -2420,327 +2559,11 @@ msgid ""
 "Check signatures against known trusted keys\n"
 msgstr ""
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Voc� decide que valor usar aqui; este valor nunca ser� exportado para\n"
-"terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
-"nada a ver com a rede de certificados (implicitamente criada)."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Para construir a Teia-de-Confian�a ('Web-of-Trust'), o GnuPG precisa de\n"
-"saber quais s�o as chaves em que deposita confian�a absoluta - normalmente\n"
-"estas s�o as chaves a que tem acesso � chave privada.  Responda \"sim\" "
-"para\n"
-"que esta chave seja de confian�a absoluta.\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Se voc� quiser usar esta chave, n�o de confian�a, assim mesmo, responda \"sim"
-"\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-"Digite o ID de utilizador do destinat�rio para quem quer enviar a\n"
-"mensagem."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"Em geral n�o � uma boa ideia utilizar a mesma chave para assinar e para\n"
-"cifrar.  Este algoritmo s� deve ser utilizado em alguns dom�nios.\n"
-"Por favor consulte primeiro o seu perito em seguran�a."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Insira o tamanho da chave"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Responda \"sim\" ou \"n�o\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Digite o valor necess�rio conforme pedido.\n"
-"� poss�vel digitar uma data ISO (AAAA-MM-DD) mas voc� n�o ter� uma boa\n"
-"reac��o a erros - o sistema tentar� interpretar o valor dado como um "
-"intervalo."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Digite o nome do possuidor da chave"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "por favor digite um endere�o de email (opcional mas recomendado)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Por favor digite um coment�rio (opcional)"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  para mudar o nome.\n"
-"C  para mudar o coment�rio.\n"
-"E  para mudar o endere�o de email\n"
-"O  para continuar a gera��o da chave.\n"
-"S  para interromper a gera��o da chave."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Quando assina uma chave de identifica��o de um utilizador, deve primeiro\n"
-"verificar que a chave pertence realmente � pessoa em quest�o. � �til para\n"
-"terceiros saberem com que cuidado � que efectuou esta verifica��o.\n"
-"\n"
-"\"0\" significa que n�o deseja declarar a forma com verificou a chave\n"
-"\n"
-"\"1\" significa que acredita que a chave pertence � pessoa em quest�o, mas\n"
-"    n�o conseguiu ou n�o tentou verificar. Este grau � �til para quando\n"
-"    assina a chave de uma utilizador pseudo-an�nimo.\n"
-"\n"
-"\"2\" significa que efectuou uma verifica��o normal da chave. Por exemplo,\n"
-"    isto pode significar que verificou a impress�o digital da chave e\n"
-"    verificou o identificador de utilizador da chave contra uma "
-"identifica��o\n"
-"    fotogr�fica.\n"
-"\n"
-"\"3\" significa que efectuou uma verifica��o exaustiva da chave. Por "
-"exemplo,\n"
-"    isto pode significar que efectuou a verifica��o pessoalmente, e que \n"
-"    utilizou um documento, com fotografia, dif�cil de falsificar \n"
-"    (como por exemplo um passaporte) que o nome do dono da chave � o\n"
-"    mesmo do que o identificador da chave, e que, finalmente, verificou\n"
-"    (atrav�s de troca de e-mail) que o endere�o de email da chave pertence\n"
-"    ao done da chave.\n"
-"\n"
-"Aten��o: os exemplos dados para os n�veis 2 e 3 s�o *apenas* exemplos.\n"
-"Compete-lhe a si decidir o que considera, ao assinar chaves, uma "
-"verifica��o\n"
-"\"normal\" e uma verifica��o \"exaustiva\".\n"
-"\n"
-"Se n�o sabe qual � a resposta correcta, responda \"0\"."
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de utilizador"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Responda \"sim\" se quiser realmente remover este ID de utilizador.\n"
-"Todos os certificados tamb�m ser�o perdidos!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Responda \"sim\" se quiser remover a subchave"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Esta � uma assinatura v�lida na chave; normalmente n�o � desej�vel\n"
-"remover esta assinatura porque ela pode ser importante para estabelecer\n"
-"uma conex�o de confian�a � chave ou a outra chave certificada por esta."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Esta assinatura n�o pode ser verificada porque voc� n�o tem a chave\n"
-"correspondente. Voc� deve adiar sua remo��o at� saber que chave foi usada\n"
-"porque a chave desta assinatura pode estabelecer uma conex�o de confian�a\n"
-"atrav�s de outra chave j� certificada."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "A assinatura n�o � v�lida. Faz sentido remov�-la do seu porta-chaves."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Esta � uma assinatura que liga o ID de utilizador � chave. Geralmente\n"
-"n�o � uma boa id�ia remover tal assinatura. � poss�vel que o GnuPG\n"
-"n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
-"raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Muda as prefer�ncias de todos os identificadores de utilizadores\n"
-"(ou apenas dos seleccionados) para a lista actual de prefer�ncias.\n"
-"O 'timestamp' de todas as auto-assinaturas afectuadas ser� avan�ado\n"
-"em um segundo.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Por favor digite a frase secreta \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Por favor repita a frase secreta, para ter certeza do que digitou."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "D� o nome para o ficheiro ao qual a assinatura se aplica"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Responda \"sim\" se quiser escrever por cima do ficheiro"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Por favor digite um novo nome de ficheiro. Se voc� apenas carregar em "
-"RETURN\n"
-"o ficheiro por omiss�o (que � mostrado entre par�nteses) ser� utilizado."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Deve especificar uma raz�o para a emiss�o do certificado. Dependendo no\n"
-"contexto, pode escolher as seguintes op��es desta lista:\n"
-"  \"A chave foi comprometida\"\n"
-"     Utilize esta op��o se tem raz�es para acreditar que indiv�duos n�o\n"
-"     autorizados obtiveram acesso � sua chave secreta.\n"
-"  \"A chave foi substituida\"\n"
-"     Utilize esta op��o se substituiu esta chave com uma mais recente.\n"
-"  \"A chave j� n�o � utilizada\"\n"
-"     Utilize esta op��o se j� n�o utiliza a chave.\n"
-"  \"O identificador do utilizador j� n�o � v�lido\"\n"
-"     Utilize esta op��o para comunicar que o identificador do utilizador\n"
-"     n�o deve ser mais utilizado; normalmente utilizada para indicar\n"
-"     que um endere�o de email � inv�lido.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Se desejar, pode inserir uma texto descrevendo a raz�o pela qual criou\n"
-"este certificado de revoga��o. Por favor mantenha este texto conciso.\n"
-"Uma linha vazia termina o texto.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
@@ -2934,13 +2757,13 @@ msgstr "chave %08lX: chave nova - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@ -3030,7 +2853,7 @@ msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
@@ -3517,8 +3340,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3527,20 +3350,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 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:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3557,7 +3380,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
@@ -3927,93 +3750,93 @@ msgstr "actualiza��o da chave secreta falhou: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4021,25 +3844,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:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4048,76 +3871,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 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:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, 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
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4126,198 +3949,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:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 #, 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:3467
+#: g10/keyedit.c:3468
 #, 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:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, 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:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, 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:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, 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:4147
+#: g10/keyedit.c:4148
 #, 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:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 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:4659
+#: g10/keyedit.c:4660
 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:4686
+#: g10/keyedit.c:4687
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4361,12 +4184,12 @@ msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
@@ -4394,109 +4217,119 @@ msgstr "cifrar dados"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4512,7 +4345,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4528,40 +4361,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4569,12 +4402,12 @@ msgstr ""
 "O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
 "No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4592,44 +4425,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4640,7 +4473,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
@@ -4657,23 +4490,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4681,12 +4514,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4698,7 +4531,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4710,50 +4543,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:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, 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:3349
+#: g10/keygen.c:3363
 #, 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:3369
+#: g10/keygen.c:3383
 #, 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:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4762,12 +4595,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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4775,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:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4783,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:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -5107,196 +4940,196 @@ msgstr "cifrado com algoritmo desconhecido %d\n"
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -5315,84 +5148,91 @@ msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr ""
+"for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
+"destinat�rio\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrar mais informa��es\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
@@ -6168,11 +6008,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6180,15 +6020,15 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
@@ -6516,7 +6356,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
@@ -6544,35 +6384,35 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6711,12 +6551,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6777,11 +6617,11 @@ msgstr "A gera��o de chaves falhou: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6893,12 +6733,12 @@ msgstr "assinatura %s de: \"%s\"\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -6907,7 +6747,7 @@ msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "a ler op��es de `%s'\n"
@@ -6970,22 +6810,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6994,11 +6834,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -7039,8 +6879,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
@@ -7173,61 +7013,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "prefer�ncia %c%lu duplicada\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7242,7 +7082,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7365,6 +7205,112 @@ msgstr "erro ao criar porta-chaves `%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (apenas assinatura)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) RSA (apenas cifragem)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (assinatura e cifragem)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (apenas assinatura)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (apenas cifragem)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+msgid "No subject name given\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Endere�o de correio eletr�nico: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Insira o identificador do utilizador. Termine com uma linha vazia: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Digite novo nome de ficheiro"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr ""
+"\n"
+"Insira o identificador do utilizador. Termine com uma linha vazia: "
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7398,199 +7344,199 @@ 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:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "resposta do agente inv�lida\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para cifrar"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7601,36 +7547,36 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [op��es] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7737,7 +7683,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7756,31 +7702,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Assinatura correcta de \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                   ou \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -8241,6 +8187,304 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Voc� decide que valor usar aqui; este valor nunca ser� exportado para\n"
+#~ "terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
+#~ "nada a ver com a rede de certificados (implicitamente criada)."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Para construir a Teia-de-Confian�a ('Web-of-Trust'), o GnuPG precisa de\n"
+#~ "saber quais s�o as chaves em que deposita confian�a absoluta - "
+#~ "normalmente\n"
+#~ "estas s�o as chaves a que tem acesso � chave privada.  Responda \"sim\" "
+#~ "para\n"
+#~ "que esta chave seja de confian�a absoluta.\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Se voc� quiser usar esta chave, n�o de confian�a, assim mesmo, responda "
+#~ "\"sim\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr ""
+#~ "Digite o ID de utilizador do destinat�rio para quem quer enviar a\n"
+#~ "mensagem."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "Em geral n�o � uma boa ideia utilizar a mesma chave para assinar e para\n"
+#~ "cifrar.  Este algoritmo s� deve ser utilizado em alguns dom�nios.\n"
+#~ "Por favor consulte primeiro o seu perito em seguran�a."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Insira o tamanho da chave"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Responda \"sim\" ou \"n�o\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Digite o valor necess�rio conforme pedido.\n"
+#~ "� poss�vel digitar uma data ISO (AAAA-MM-DD) mas voc� n�o ter� uma boa\n"
+#~ "reac��o a erros - o sistema tentar� interpretar o valor dado como um "
+#~ "intervalo."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Digite o nome do possuidor da chave"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "por favor digite um endere�o de email (opcional mas recomendado)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Por favor digite um coment�rio (opcional)"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  para mudar o nome.\n"
+#~ "C  para mudar o coment�rio.\n"
+#~ "E  para mudar o endere�o de email\n"
+#~ "O  para continuar a gera��o da chave.\n"
+#~ "S  para interromper a gera��o da chave."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Quando assina uma chave de identifica��o de um utilizador, deve primeiro\n"
+#~ "verificar que a chave pertence realmente � pessoa em quest�o. � �til "
+#~ "para\n"
+#~ "terceiros saberem com que cuidado � que efectuou esta verifica��o.\n"
+#~ "\n"
+#~ "\"0\" significa que n�o deseja declarar a forma com verificou a chave\n"
+#~ "\n"
+#~ "\"1\" significa que acredita que a chave pertence � pessoa em quest�o, "
+#~ "mas\n"
+#~ "    n�o conseguiu ou n�o tentou verificar. Este grau � �til para quando\n"
+#~ "    assina a chave de uma utilizador pseudo-an�nimo.\n"
+#~ "\n"
+#~ "\"2\" significa que efectuou uma verifica��o normal da chave. Por "
+#~ "exemplo,\n"
+#~ "    isto pode significar que verificou a impress�o digital da chave e\n"
+#~ "    verificou o identificador de utilizador da chave contra uma "
+#~ "identifica��o\n"
+#~ "    fotogr�fica.\n"
+#~ "\n"
+#~ "\"3\" significa que efectuou uma verifica��o exaustiva da chave. Por "
+#~ "exemplo,\n"
+#~ "    isto pode significar que efectuou a verifica��o pessoalmente, e que \n"
+#~ "    utilizou um documento, com fotografia, dif�cil de falsificar \n"
+#~ "    (como por exemplo um passaporte) que o nome do dono da chave � o\n"
+#~ "    mesmo do que o identificador da chave, e que, finalmente, verificou\n"
+#~ "    (atrav�s de troca de e-mail) que o endere�o de email da chave "
+#~ "pertence\n"
+#~ "    ao done da chave.\n"
+#~ "\n"
+#~ "Aten��o: os exemplos dados para os n�veis 2 e 3 s�o *apenas* exemplos.\n"
+#~ "Compete-lhe a si decidir o que considera, ao assinar chaves, uma "
+#~ "verifica��o\n"
+#~ "\"normal\" e uma verifica��o \"exaustiva\".\n"
+#~ "\n"
+#~ "Se n�o sabe qual � a resposta correcta, responda \"0\"."
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de utilizador"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Responda \"sim\" se quiser realmente remover este ID de utilizador.\n"
+#~ "Todos os certificados tamb�m ser�o perdidos!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Responda \"sim\" se quiser remover a subchave"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Esta � uma assinatura v�lida na chave; normalmente n�o � desej�vel\n"
+#~ "remover esta assinatura porque ela pode ser importante para estabelecer\n"
+#~ "uma conex�o de confian�a � chave ou a outra chave certificada por esta."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Esta assinatura n�o pode ser verificada porque voc� n�o tem a chave\n"
+#~ "correspondente. Voc� deve adiar sua remo��o at� saber que chave foi "
+#~ "usada\n"
+#~ "porque a chave desta assinatura pode estabelecer uma conex�o de "
+#~ "confian�a\n"
+#~ "atrav�s de outra chave j� certificada."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "A assinatura n�o � v�lida. Faz sentido remov�-la do seu porta-chaves."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Esta � uma assinatura que liga o ID de utilizador � chave. Geralmente\n"
+#~ "n�o � uma boa id�ia remover tal assinatura. � poss�vel que o GnuPG\n"
+#~ "n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
+#~ "raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
+
+#~ 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 ""
+#~ "Muda as prefer�ncias de todos os identificadores de utilizadores\n"
+#~ "(ou apenas dos seleccionados) para a lista actual de prefer�ncias.\n"
+#~ "O 'timestamp' de todas as auto-assinaturas afectuadas ser� avan�ado\n"
+#~ "em um segundo.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Por favor digite a frase secreta \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "Por favor repita a frase secreta, para ter certeza do que digitou."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "D� o nome para o ficheiro ao qual a assinatura se aplica"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Responda \"sim\" se quiser escrever por cima do ficheiro"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Por favor digite um novo nome de ficheiro. Se voc� apenas carregar em "
+#~ "RETURN\n"
+#~ "o ficheiro por omiss�o (que � mostrado entre par�nteses) ser� utilizado."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Deve especificar uma raz�o para a emiss�o do certificado. Dependendo no\n"
+#~ "contexto, pode escolher as seguintes op��es desta lista:\n"
+#~ "  \"A chave foi comprometida\"\n"
+#~ "     Utilize esta op��o se tem raz�es para acreditar que indiv�duos n�o\n"
+#~ "     autorizados obtiveram acesso � sua chave secreta.\n"
+#~ "  \"A chave foi substituida\"\n"
+#~ "     Utilize esta op��o se substituiu esta chave com uma mais recente.\n"
+#~ "  \"A chave j� n�o � utilizada\"\n"
+#~ "     Utilize esta op��o se j� n�o utiliza a chave.\n"
+#~ "  \"O identificador do utilizador j� n�o � v�lido\"\n"
+#~ "     Utilize esta op��o para comunicar que o identificador do utilizador\n"
+#~ "     n�o deve ser mais utilizado; normalmente utilizada para indicar\n"
+#~ "     que um endere�o de email � inv�lido.\n"
+
+#~ 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 ""
+#~ "Se desejar, pode inserir uma texto descrevendo a raz�o pela qual criou\n"
+#~ "este certificado de revoga��o. Por favor mantenha este texto conciso.\n"
+#~ "Uma linha vazia termina o texto.\n"
+
 #, fuzzy
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
@@ -8381,9 +8625,6 @@ msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 #~ msgid "unknown packet type"
 #~ msgstr "formato de pacote desconhecido"
 
-#~ msgid "unknown version"
-#~ msgstr "vers�o desconhecida"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "algoritmo de chave p�blica desconhecido"
 
@@ -8498,9 +8739,6 @@ msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 #~ msgid "network error"
 #~ msgstr "erro na rede"
 
-#~ msgid "not encrypted"
-#~ msgstr "n�o cifrado"
-
 #~ msgid "not processed"
 #~ msgstr "n�o processado"
 
@@ -8837,9 +9075,6 @@ msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 #~ msgid "%08lX: We do NOT trust this key\n"
 #~ msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (assinatura e cifragem)\n"
-
 #, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "   (%d) RSA (apenas assinatura)\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b24ec90e2..8c49a80bb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+0100\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -45,51 +45,51 @@ msgstr "Por favor digite a frase secreta"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caractere inv�lido no nome\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorreta"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorreta"
@@ -99,21 +99,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -196,8 +196,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -276,7 +276,7 @@ msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -295,13 +295,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
@@ -383,8 +383,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
@@ -400,29 +400,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
@@ -532,12 +533,12 @@ msgstr "\t%lu chaves ignoradas\n"
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -607,7 +608,7 @@ msgstr ""
 msgid "error opening `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
@@ -632,7 +633,7 @@ msgstr "erro de leitura: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -858,6 +859,149 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "Certificado de revoga��o v�lido"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr ""
+"Nenhum certificado com confian�a indefinida encontrado.\n"
+"\n"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "Nenhuma ajuda dispon�vel"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: chaveiro criado\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "armadura: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Algoritmos suportados:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "n�o criptografado"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "verifica��o de assinatura suprimida\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Esta chave n�o � protegida.\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Assinatura correta de \""
+
+# "hash" poderia ser "espalhamento", mas n�o fica claro
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "algoritmo de hash inv�lido `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Esta chave n�o � protegida.\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Certificado de revoga��o v�lido"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr ""
+"Nenhum certificado com confian�a indefinida encontrado.\n"
+"\n"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "Certificado correto"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "Certificado inv�lido"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "vers�o desconhecida"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Nenhuma ajuda dispon�vel para `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "erro na linha \"trailer\"\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -982,14 +1126,14 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
@@ -1169,7 +1313,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -1287,18 +1431,18 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -1342,7 +1486,7 @@ msgstr "h� uma chave secreta para esta chave p�blica!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -1361,7 +1505,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
@@ -1386,7 +1530,7 @@ 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:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1413,19 +1557,19 @@ msgstr "%s/%s criptografado para: %s\n"
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "eliminar o campo keyid dos pacotes criptografados\n"
@@ -1573,7 +1717,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
@@ -1588,7 +1732,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1604,29 +1748,29 @@ msgstr "|[arquivo]|fazer uma assinatura"
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "listar as chaves"
 
@@ -1639,11 +1783,11 @@ msgstr "listar as chaves e as assinaturas"
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
@@ -1681,11 +1825,11 @@ msgstr "gerar um certificado de revoga��o"
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
@@ -1723,11 +1867,11 @@ msgstr "atualizar o banco de dados de confiabilidade"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1738,36 +1882,36 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -1783,13 +1927,13 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1827,7 +1971,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1847,12 +1991,12 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1860,7 +2004,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
@@ -1931,477 +2075,477 @@ msgstr "%s: novo arquivo de op��es criado\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, 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:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2970
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2976
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:2989
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 #, 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:3048
+#: g10/gpg.c:3096
 #, 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:3051
+#: g10/gpg.c:3099
 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:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3212
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, 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:3272
+#: g10/gpg.c:3320
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3449
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, 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:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -2416,7 +2560,7 @@ msgstr "Deletar esta chave do chaveiro? "
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
@@ -2436,269 +2580,11 @@ msgstr ""
 "Sintaxe: gpgm [op��es] [arquivos]\n"
 "Utilit�rio de manuten��o do GnuPG\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Voc� decide que valor usar aqui; este valor nunca ser� exportado para\n"
-"terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
-"nada a ver com a rede de certificados (implicitamente criada)."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Se voc� quiser usar esta chave n�o confi�vel assim mesmo, responda \"sim\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-"Digite o ID de usu�rio do destinat�rio para o qual voc� quer enviar a\n"
-"mensagem."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Digite o tamanho da chave"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Responda \"sim\" ou \"n�o\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Digite o valor necess�rio conforme pedido.\n"
-"� poss�vel digitar uma data ISO (AAAA-MM-DD) mas voc� n�o ter� uma boa\n"
-"rea��o a erros - o sistema tentar� interpretar o valor dado como um "
-"intervalo."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Digite o nome do possuidor da chave"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "por favor digite um endere�o de email (opcional mas recomendado)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Por favor digite um coment�rio (opcional)"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  para mudar o nome.\n"
-"C  para mudar o coment�rio.\n"
-"E  para mudar o endere�o de correio eletr�nico.\n"
-"O  para continuar a gera��o da chave.\n"
-"S  para interromper a gera��o da chave."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de usu�rio"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Responda \"sim\" se quiser realmente remover este ID de usu�rio.\n"
-"Todos os certificados tamb�m ser�o perdidos!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Responda \"sim\" se quiser remover a subchave"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Esta � uma assinatura v�lida na chave; normalmente n�o � desej�vel\n"
-"remover esta assinatura porque ela pode ser importante para estabelecer\n"
-"uma conex�o de confian�a � chave ou a outra chave certificada por esta."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Esta assinatura n�o pode ser verificada porque voc� n�o tem a chave\n"
-"correspondente. Voc� deve adiar sua remo��o at� saber que chave foi usada\n"
-"porque a chave desta assinatura pode estabelecer uma conex�o de confian�a\n"
-"atrav�s de outra chave j� certificada."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "A assinatura n�o � v�lida. Faz sentido remov�-la de seu chaveiro."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Esta � uma assinatura que liga o ID de usu�rio � chave. Geralmente\n"
-"n�o � uma boa id�ia remover tal assinatura. � poss�vel que o GnuPG\n"
-"n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
-"raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-
-#: g10/helptext.c:230
-#, fuzzy
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Por favor digite a frase secreta"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-"Por favor repita a �ltima frase secreta, para ter certeza do que voc� "
-"digitou."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "D� o nome para o arquivo ao qual a assinatura se aplica"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Responda \"sim\" se quiser sobrescrever o arquivo"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Por favor digite um novo nome de arquivo. Se voc� apenas apertar RETURN o\n"
-"arquivo padr�o (que � mostrado em colchetes) ser� usado."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
@@ -2893,13 +2779,13 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
@@ -2989,7 +2875,7 @@ msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
@@ -3458,8 +3344,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3468,21 +3354,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3499,7 +3385,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
@@ -3869,393 +3755,393 @@ msgstr "atualiza��o da chave secreta falhou: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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:3020
+#: g10/keyedit.c:3021
 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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 #, 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:3031
+#: g10/keyedit.c:3032
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 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:3366
+#: g10/keyedit.c:3367
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3386
+#: g10/keyedit.c:3387
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3426
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3448
+#: g10/keyedit.c:3449
 #, 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:3467
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, 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:4147
+#: g10/keyedit.c:4148
 #, 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:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 #, 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:4659
+#: g10/keyedit.c:4660
 #, 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:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4303,12 +4189,12 @@ msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
@@ -4336,109 +4222,119 @@ msgstr "criptografar dados"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4454,7 +4350,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -4471,40 +4367,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4512,12 +4408,12 @@ msgstr ""
 "Seu sistema n�o consegue mostrar datas al�m de 2038.\n"
 "Apesar disso, elas ser�o corretamente manipuladas at� 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4534,44 +4430,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4582,7 +4478,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4597,24 +4493,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4622,12 +4518,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4639,7 +4535,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4651,50 +4547,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:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, 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:3349
+#: g10/keygen.c:3363
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4703,12 +4599,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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4716,7 +4612,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4724,26 +4620,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -5056,196 +4952,196 @@ msgstr "criptografado com algoritmo desconhecido %d\n"
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -5264,82 +5160,87 @@ msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "algoritmo de criptografia n�o implementado"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
@@ -6112,25 +6013,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:758
+#: g10/sign.c:760
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:834
+#: g10/sign.c:836
 #, 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:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1260
+#: g10/sign.c:1262
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
@@ -6462,7 +6363,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
@@ -6491,33 +6392,33 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6657,12 +6558,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6723,11 +6624,11 @@ msgstr "A gera��o de chaves falhou: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6839,12 +6740,12 @@ msgstr "assinatura %s de: %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -6853,7 +6754,7 @@ msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "lendo op��es de `%s'\n"
@@ -6916,21 +6817,21 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6939,11 +6840,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -6984,8 +6885,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
@@ -7123,68 +7024,68 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "Certificado correto"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 #, fuzzy
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 #, fuzzy
 msgid "certificate chain too long\n"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 #, fuzzy
 msgid "issuer certificate not found"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "certificado duplicado - removido"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7199,7 +7100,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7322,6 +7223,108 @@ msgstr "erro na escrita do chaveiro `%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) DSA (apenas assinatura)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) ElGamal (apenas criptografia)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (apenas assinatura)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) ElGamal (apenas criptografia)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+msgid "No subject name given\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+# "hash" poderia ser "espalhamento", mas n�o fica claro
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "algoritmo de hash inv�lido `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Endere�o de correio eletr�nico: "
+
+#: sm/certreqgen-ui.c:235
+msgid " (end with an empty line):\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Digite novo nome de arquivo"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+msgid " (optional; end with an empty line):\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "Digite o identificador de usu�rio: "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7355,197 +7358,197 @@ msgstr "certificado duplicado - removido"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7556,36 +7559,36 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Uso: gpgm [op��es] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7692,7 +7695,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7711,31 +7714,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Esta chave n�o � protegida.\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Assinatura correta de \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                   ou \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
@@ -8196,6 +8199,158 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Voc� decide que valor usar aqui; este valor nunca ser� exportado para\n"
+#~ "terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
+#~ "nada a ver com a rede de certificados (implicitamente criada)."
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Se voc� quiser usar esta chave n�o confi�vel assim mesmo, responda \"sim"
+#~ "\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr ""
+#~ "Digite o ID de usu�rio do destinat�rio para o qual voc� quer enviar a\n"
+#~ "mensagem."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Digite o tamanho da chave"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Responda \"sim\" ou \"n�o\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Digite o valor necess�rio conforme pedido.\n"
+#~ "� poss�vel digitar uma data ISO (AAAA-MM-DD) mas voc� n�o ter� uma boa\n"
+#~ "rea��o a erros - o sistema tentar� interpretar o valor dado como um "
+#~ "intervalo."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Digite o nome do possuidor da chave"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "por favor digite um endere�o de email (opcional mas recomendado)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Por favor digite um coment�rio (opcional)"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  para mudar o nome.\n"
+#~ "C  para mudar o coment�rio.\n"
+#~ "E  para mudar o endere�o de correio eletr�nico.\n"
+#~ "O  para continuar a gera��o da chave.\n"
+#~ "S  para interromper a gera��o da chave."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Responda \"sim\" (ou apenas \"s\") se quiser gerar a subchave."
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Responda \"sim\" se quiser assinar TODOS os IDs de usu�rio"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Responda \"sim\" se quiser realmente remover este ID de usu�rio.\n"
+#~ "Todos os certificados tamb�m ser�o perdidos!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Responda \"sim\" se quiser remover a subchave"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Esta � uma assinatura v�lida na chave; normalmente n�o � desej�vel\n"
+#~ "remover esta assinatura porque ela pode ser importante para estabelecer\n"
+#~ "uma conex�o de confian�a � chave ou a outra chave certificada por esta."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Esta assinatura n�o pode ser verificada porque voc� n�o tem a chave\n"
+#~ "correspondente. Voc� deve adiar sua remo��o at� saber que chave foi "
+#~ "usada\n"
+#~ "porque a chave desta assinatura pode estabelecer uma conex�o de "
+#~ "confian�a\n"
+#~ "atrav�s de outra chave j� certificada."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr "A assinatura n�o � v�lida. Faz sentido remov�-la de seu chaveiro."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Esta � uma assinatura que liga o ID de usu�rio � chave. Geralmente\n"
+#~ "n�o � uma boa id�ia remover tal assinatura. � poss�vel que o GnuPG\n"
+#~ "n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
+#~ "raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
+
+#, fuzzy
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Por favor digite a frase secreta"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr ""
+#~ "Por favor repita a �ltima frase secreta, para ter certeza do que voc� "
+#~ "digitou."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "D� o nome para o arquivo ao qual a assinatura se aplica"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Responda \"sim\" se quiser sobrescrever o arquivo"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Por favor digite um novo nome de arquivo. Se voc� apenas apertar RETURN "
+#~ "o\n"
+#~ "arquivo padr�o (que � mostrado em colchetes) ser� usado."
+
 #, fuzzy
 #~ msgid "shelll"
 #~ msgstr "help"
@@ -8286,10 +8441,6 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 #~ msgstr "Digite o identificador de usu�rio: "
 
 #, fuzzy
-#~ msgid "Enter PIN: "
-#~ msgstr "Digite o identificador de usu�rio: "
-
-#, fuzzy
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
 
@@ -8303,9 +8454,6 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 #~ msgid "unknown packet type"
 #~ msgstr "formato de pacote desconhecido"
 
-#~ msgid "unknown version"
-#~ msgstr "vers�o desconhecida"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "algoritmo de chave p�blica desconhecido"
 
@@ -8424,9 +8572,6 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 #~ msgid "network error"
 #~ msgstr "erro na rede"
 
-#~ msgid "not encrypted"
-#~ msgstr "n�o criptografado"
-
 #~ msgid "not processed"
 #~ msgstr "n�o processado(s)"
 
@@ -8758,10 +8903,6 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 #~ msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
 #, fuzzy
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
-
-#, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "   (%d) DSA (apenas assinatura)\n"
 
@@ -9232,9 +9373,6 @@ msgstr "algoritmo de prote��o %d n�o � suportado\n"
 #~ msgid "Invalid certificate revocation"
 #~ msgstr "Certificado de revoga��o inv�lido"
 
-#~ msgid "Invalid certificate"
-#~ msgstr "Certificado inv�lido"
-
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "registro de assinatura %lu[%d] aponta para registro errado.\n"
 
diff --git a/po/ro.po b/po/ro.po
index c528897a3..95d1c56ec 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+0100\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -44,51 +44,51 @@ msgstr ""
 msgid "Quality:"
 msgstr "validitate: %s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lung�"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid �n nume\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "fraz�-parol� incorect�"
@@ -98,21 +98,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -195,8 +195,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -275,7 +275,7 @@ msgid "Please enter the new passphrase"
 msgstr "schimb� fraza-parol�"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -294,13 +294,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "locvace"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
@@ -382,8 +382,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
@@ -399,29 +399,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
@@ -533,12 +534,12 @@ msgstr "%s: s�rit�: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -612,7 +613,7 @@ msgstr "anulat�"
 msgid "error opening `%s': %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
@@ -637,7 +638,7 @@ msgstr "eroare citire �n `%s': %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -863,6 +864,145 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "certificat incorect"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "certificat incorect"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "afi�eaz� toate datele disponibile"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: inelul de chei creat\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "validitate: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Algoritmuri suportate:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "necifrat"
+
+#: common/audit.c:740
+#, fuzzy
+msgid "Number of recipients"
+msgstr "Destinatari curen�i:\n"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "verificare semn�tur� eliminat�\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Semn�tur� f�cut� %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Semn�tur� bun� din \"%s\""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "algoritm hash invalid `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Semn�tur� f�cut� %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Aceast� cheie a expirat!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "certificat incorect"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "certificat incorect"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "certificat incorect"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "versiune necunoscut�"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Nici un disponibil disponibil pentru `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "eroare linia de trailer\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -983,13 +1123,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
@@ -1156,7 +1296,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
@@ -1260,18 +1400,18 @@ msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1313,7 +1453,7 @@ msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -1332,7 +1472,7 @@ msgstr "folosesc cifrul %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
@@ -1361,7 +1501,7 @@ msgstr ""
 "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1390,18 +1530,18 @@ msgstr "%s/%s cifrat pentru: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "problem� cu m�nuirea pachetului cifrat\n"
 
@@ -1548,7 +1688,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
@@ -1563,7 +1703,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1579,27 +1719,27 @@ msgstr "|[fi�ier]|creaz� o semn�tur�"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "enumer� chei"
 
@@ -1611,11 +1751,11 @@ msgstr "enumer� chei �i semn�turi"
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
@@ -1651,11 +1791,11 @@ msgstr "genereaz� un certificat de revocare"
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
@@ -1691,11 +1831,11 @@ msgstr "actualizeaz� baza de date de �ncredere"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1706,32 +1846,32 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
@@ -1747,7 +1887,7 @@ msgstr "folose�te comportament strict OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1755,7 +1895,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1793,7 +1933,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1813,11 +1953,11 @@ msgstr "Cifru: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1825,7 +1965,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
@@ -1912,464 +2052,464 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, 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:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 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:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 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:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -2381,7 +2521,7 @@ msgstr "ia cheile de pe acest inel de chei"
 msgid "make timestamp conflicts only a warning"
 msgstr "d� numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
@@ -2397,342 +2537,11 @@ msgstr ""
 "Sintax�: gpg [op�iuni] [fi�iere]\n"
 "Verific� semn�turi folosind cheile cunoscute ca fiind de �ncredere\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Este sarcina d-voastr� s� atribui�i o valoare aici; aceast� valoare\n"
-"nu va fi niciodat� exportat� pentru o ter�� parte.  Trebuie s�\n"
-"implement�m re�eaua-de-�ncredere; aceasta nu are nimic �n comun cu\n"
-"certificatele-de-re�ea (create implicit)."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Pentru a construi Re�eaua-de-�ncredere, GnuPG trebuie s� �tie care chei\n"
-"au nivel de �ncredere suprem - acestea de obicei sunt cheile pentru care\n"
-"ave�i acces la cheia secret�.  R�spunde�i \"da\" pentru a seta\n"
-"aceast� cheie cu nivel de �ncredere suprem\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Dac� dori�i oricum s� folosi�i aceast� cheie f�r� �ncredere, r�spunde�i \"da"
-"\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Introduce�i ID-ul utilizator al destinatarului mesajului."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"Selecta�i algoritmul de folosit.\n"
-"\n"
-"DSA (aka DSS) este Digital Signature Algorithm �i poate fi folosit numai\n"
-"pentru semn�turi.\n"
-"\n"
-"Elgamal este un algoritm numai pentru cifrare.\n"
-"\n"
-"RSA poate fi folosit pentru semn�turi sau cifrare.\n"
-"\n"
-"Prima cheie (primar�) trebuie s� fie �ntotdeauna o cheie cu care se poate "
-"semna."
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"�n general nu este o idee bun� s� folosi�i aceea�i cheie �i pentru\n"
-"semnare �i pentru cifrare.  Acest algoritm ar trebui folosit numai\n"
-"�n anumite domenii.  V� rug�m consulta�i mai �nt�i un expert �n domeniu."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Introduce�i lungimea cheii"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "R�spunde�i \"da\" sau \"nu\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Introduce�i valoarea cerut� precum a ar�tat la prompt.\n"
-"Este posibil s� introduce�i o dat� ISO (AAAA-LL-ZZ) dar nu ve�i\n"
-"ob�ine un r�spuns de eroare bun - �n loc sistemul �ncearc� s�\n"
-"interpreteze valoare dat� ca un interval."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Introduce�i numele de�in�torului cheii"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "v� rug�m introduce�i o adres� de email (op�ional� dar recomandat�)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "V� rug�m introduce�i un comentriu op�ional"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  pentru a schimba numele.\n"
-"C  pentru a schimba comentariul.\n"
-"E  pentru a schimba adresa de email.\n"
-"O  pentru a continua cu generarea cheii.\n"
-"T  pentru a termina generarea cheii."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr ""
-"R�spunde�i \"da\" (sau numai \"d\") dac� sunte�i OK s� genera�i subcheia."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"C�nd semna�i un ID utilizator pe o cheie ar trebui s� verifica�i mai �nt�i\n"
-"c� cheia apar�ine persoanei numite �n ID-ul utilizator.  Este util �i "
-"altora\n"
-"s� �tie c�t de atent a�i verificat acest lucru.\n"
-"\n"
-"\"0\" �nseamn� c� nu pretinde�i nimic despre c�t de atent a�i verificat "
-"cheia\n"
-"\"1\" �nseamn� c� crede�i c� cheia este a persoanei ce pretinde c� este\n"
-"    proprietarul ei, dar n-a�i putut, sau nu a�i verificat deloc cheia.\n"
-"    Aceasta este util� pentru verificare \"persona\", unde semna�i cheia\n"
-"    unui utilizator pseudonim.\n"
-"\n"
-"\"2\" �nseamn� c� a�i f�cut o verificare supericial� a cheii.  De exemplu,\n"
-"    aceasta ar putea �nsemna c� a�i verificat amprenta cheii �i a�i "
-"verificat\n"
-"    ID-ul utilizator de pe cheie cu un ID cu poz�.\n"
-"\n"
-"\"3\" �nseamn� c� a�i f�cut o verificare extensiv� a cheii.  De exemplu,\n"
-"    aceasta ar putea �nsemna c� a�i verificat amprenta cheii cu "
-"proprietarul\n"
-"    cheii �n persoan�, c� a�i verificat folosind un document dificil de\n"
-"    falsificat cu poz� (cum ar fi un pa�aport) c� numele proprietarului "
-"cheii\n"
-"    este acela�i cu numele ID-ului utilizator al cheii �i c� a�i verificat\n"
-"    (schimb�nd emailuri) c� adresa de email de pe cheie apar�ine "
-"proprietarului\n"
-"cheii.\n"
-"\n"
-"De notat c� exemplele date pentru nivelele 2 �i 3 ceva mai sus sunt *numai*\n"
-"exemple. La urma urmei, d-voastr� decide�i ce �nseamn� \"superficial\" �i\n"
-"\"extensiv\" pentru d-voastr� c�nd semna�i alte chei.\n"
-"\n"
-"Dac� nu �ti�i care este r�spunsul, r�spunde�i \"0\"."
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "R�spunde�i \"da\" dac� dori�i s� semna�i TOATE ID-urile utilizator"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"R�spunde�i \"da\" dac� �ntr-adev�r dori�i s� �terge�i acest ID utilizator.\n"
-"Toate certificatele sunt de asemenea pierdute!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "R�spunde�i \"da\" dac� este OK s� �terge�i subcheia"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Aceasta este o semn�tur� valid� pe cheie; �n mod normal n-ar trebui\n"
-"s� �terge�i aceast� semn�tur� pentru c� aceasta ar putea fi important�la "
-"stabilirea conexiunii de �ncredere la cheie sau alt� cheie certificat�\n"
-"de aceast� cheie."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Aceast� semn�tur� nu poate fi verificat� pentru c� nu ave�i cheia\n"
-"corespunz�toare.  Ar trebui s� am�na�i �tergerea sa p�n� �ti�i care\n"
-"cheie a fost folosit� pentru c� aceast� cheie de semnare ar putea\n"
-"constitui o conexiune de �ncredere spre o alt� cheie deja certificat�."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-"Semn�tura nu este valid�.  Aceasta ar trebui �tears� de pe inelul\n"
-"d-voastr� de chei."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Aceasta este o semn�tur� care leag� ID-ul utilizator de cheie.\n"
-"De obicei nu este o idee bun� s� �terge�i o asemenea semn�tur�.\n"
-"De fapt, GnuPG ar putea s� nu mai poat� folosi aceast� cheie.\n"
-"A�a c� face�i acest lucru numai dac� aceast� auto-semn�tur� este\n"
-"dintr-o oarecare cauz� invalid� �i o a doua este disponibil�."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Schimba�i toate preferin�ele ale tuturor ID-urilor utilizator (sau doar\n"
-"cele selectate) conform cu lista curent� de preferin�e.  Timestamp-urile\n"
-"tuturor auto-semn�turilor afectate vor fi avansate cu o secund�.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr ""
-"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-"V� rug�m repeta�i ultima fraz�-parol�, pentru a fi sigur(�) ce a�i tastat."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Da�i numele fi�ierului la care se aplic� semn�tura"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "R�spunde�i \"da\" dac� este OK s� suprascrie�i fi�ierul"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"V� rug�m introduce�i un nou nume-fi�ier. Dac� doar ap�sa�i RETURN,\n"
-"va fi folosit fi�ierul implicit (ar�tat �n paranteze)."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Ar trebui s� specifica�i un motiv pentru certificare.  �n func�ie de\n"
-"context ave�i posibilitatea s� alege�i din aceast� list�:\n"
-"  \"Cheia a fost compromis�\"\n"
-"      Folosi�i aceast� op�iune dac� ave�i un motiv s� crede�i c� persoane\n"
-"      neautorizate au avut acces la cheia d-voastr� secret�.\n"
-"  \"Cheia este �nlocuit�\"\n"
-"      Folosi�i aceast� op�iune dac� �nlocui�i cheia cu una nou�.\n"
-"  \"Cheia nu mai este folosit�\"\n"
-"      Folosi�i aceast� op�iune dac� pensiona�i cheia.\n"
-"  \"ID-ul utilizator nu mai este valid\"\n"
-"      Folosi�i aceast� op�iune dac� ID-ul utilizator nu mai trebuie "
-"folosit;\n"
-"      de obicei folosit� pentru a marca o adres� de email ca invalid�.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Dac� dori�i, pute�i introduce un text descriind de ce publica�i acest\n"
-"certificat de revocare.  V� rug�m fi�i concis.\n"
-"O linie goal� termin� textul.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Nici un ajutor disponibil"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nici un disponibil disponibil pentru `%s'"
@@ -2930,13 +2739,13 @@ msgstr "cheia %s: cheie nou� - s�rit�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
@@ -3025,7 +2834,7 @@ msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
@@ -3486,8 +3295,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:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
@@ -3498,19 +3307,19 @@ msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
 "parol� de schimbat.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 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:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
@@ -3527,7 +3336,7 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
@@ -3869,92 +3678,92 @@ msgstr "actualizarea secretului a e�uat: %s\n"
 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:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota�ie:"
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3963,17 +3772,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -3982,7 +3791,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3991,74 +3800,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 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:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "invalid(�)"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4068,196 +3877,196 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 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:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, 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:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 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:4147
+#: g10/keyedit.c:4148
 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:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 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:4659
+#: g10/keyedit.c:4660
 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:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 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:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, 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"
@@ -4297,12 +4106,12 @@ msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
@@ -4328,109 +4137,119 @@ msgstr "Cifreaz�"
 msgid "Authenticate"
 msgstr "Autentific�"
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Ac�iuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "Ac�iuni permise curent: "
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Comut� capabilitatea de semnare\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Comut� capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Comut� capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecta�i ce fel de cheie dori�i:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA �i Elgamal (implicit)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (numai cifrare)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Perechea de chei DSA va avea %u bi�i.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "cheile %s pot avea lungimea �ntre %u �i %u bi�i.\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie dori�i? (%u) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "dimensiunile cheii %s trebuie s� fie �n intervalul %u-%u\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesar� este %u bi�i\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjit� prin adaos la %u bi�i\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4446,7 +4265,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4462,38 +4281,38 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semn�tura este valid� pentru? (%s) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expir� deloc\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "Semn�tura nu expir� deloc\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expir� pe %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semn�tura expir� pe %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4501,11 +4320,11 @@ msgstr ""
 "Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
 "Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4522,44 +4341,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4570,7 +4389,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 
@@ -4585,23 +4404,23 @@ msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4609,12 +4428,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4625,7 +4444,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:2147
+#: g10/keygen.c:2161
 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"
@@ -4637,50 +4456,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:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, 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:3349
+#: g10/keygen.c:3363
 #, 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:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 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"
@@ -4690,12 +4509,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4703,7 +4522,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4711,25 +4530,25 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, 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:3917
+#: g10/keygen.c:3931
 #, 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"
@@ -5031,192 +4850,192 @@ msgstr "fraza-parol� generat� cu un algoritm rezumat necunoscut %d\n"
 msgid "public key is %s\n"
 msgstr "cheia public� este %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie public�: DEK bun\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie public� a e�uat: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrat� cu %lu fraze-parol�\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrat� cu 1 fraz�-parol�\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fi�ier original='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semn�tur� INCORECT� din \"%s\""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semn�tur� expirat� din \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, 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:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
@@ -5235,81 +5054,86 @@ msgstr "fstat(%d) a e�uat �n %s: %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul cu cheie public� experimental %s\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul de cifrare experimental %s\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = arat�-mi mai multe informa�ii\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
@@ -6084,11 +5908,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6096,15 +5920,15 @@ msgstr ""
 "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
 "destinatarului\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
@@ -6423,7 +6247,7 @@ msgstr "suprem�"
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urm�toarea verificare trustdb programat� pe %s\n"
@@ -6451,34 +6275,34 @@ msgstr "v� rug�m face�i un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chei procesate (%d num�r�tori valide anulate)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginal(e) necesare, %d complet(e) necesare, model de �ncredere %s\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "ad�nc: %d  valid: %3d  semnat: %3d  �ncredere: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6618,12 +6442,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
@@ -6684,11 +6508,11 @@ msgstr "verificarea CHV%d a e�uat: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
@@ -6795,13 +6619,13 @@ msgstr "semn�tur� %s, algoritm rezumat %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 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:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -6810,7 +6634,7 @@ msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "citesc op�iuni din `%s'\n"
@@ -6873,22 +6697,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 invalid %02X s�rit\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6897,11 +6721,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "ajutor"
@@ -6942,8 +6766,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
@@ -7077,61 +6901,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verific� o semn�tur�"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "preferin�a `%s' duplicat�\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "certificat incorect"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7146,7 +6970,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7268,6 +7092,112 @@ msgstr "eroare la crearea inelului de chei `%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (numai semnare)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (2) Cheie de cifrare\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, fuzzy, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "Ac�iuni posibile pentru o cheie %s: "
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (semnare �i cifrare)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (numai semnare)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (numai cifrare)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(Nici o descriere dat�)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "algoritm hash invalid `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Adres� de email: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Introduce�i ID-ul utilizator.  Termina�i cu o linie nou�: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Introduce�i un nou nume-fi�ier"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "Introduce�i PIN: "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7301,196 +7231,196 @@ msgstr "preferin�a `%s' duplicat�\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "enumer� chei secrete"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "register a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "folose�te cheia implicit� ca destinatar implicit"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "nu folosi deloc terminalul"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "for�eaz� semn�turi v3"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "folose�te �ntotdeauna un MDC pentru cifrare"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "modul batch: nu �ntreba niciodat�"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "presupune da la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "presupune nu la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "adaug� acest inel de chei la lista inelelor de chei"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "adaug� acest inel de chei secret la list�"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NUME|folose�te algoritm cifrare NUME"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|folose�te algoritm compresie N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7501,36 +7431,36 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7637,7 +7567,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7656,31 +7586,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                aka \"%s\""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
@@ -8139,6 +8069,331 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Este sarcina d-voastr� s� atribui�i o valoare aici; aceast� valoare\n"
+#~ "nu va fi niciodat� exportat� pentru o ter�� parte.  Trebuie s�\n"
+#~ "implement�m re�eaua-de-�ncredere; aceasta nu are nimic �n comun cu\n"
+#~ "certificatele-de-re�ea (create implicit)."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Pentru a construi Re�eaua-de-�ncredere, GnuPG trebuie s� �tie care chei\n"
+#~ "au nivel de �ncredere suprem - acestea de obicei sunt cheile pentru care\n"
+#~ "ave�i acces la cheia secret�.  R�spunde�i \"da\" pentru a seta\n"
+#~ "aceast� cheie cu nivel de �ncredere suprem\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Dac� dori�i oricum s� folosi�i aceast� cheie f�r� �ncredere, r�spunde�i "
+#~ "\"da\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "Introduce�i ID-ul utilizator al destinatarului mesajului."
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "Selecta�i algoritmul de folosit.\n"
+#~ "\n"
+#~ "DSA (aka DSS) este Digital Signature Algorithm �i poate fi folosit numai\n"
+#~ "pentru semn�turi.\n"
+#~ "\n"
+#~ "Elgamal este un algoritm numai pentru cifrare.\n"
+#~ "\n"
+#~ "RSA poate fi folosit pentru semn�turi sau cifrare.\n"
+#~ "\n"
+#~ "Prima cheie (primar�) trebuie s� fie �ntotdeauna o cheie cu care se poate "
+#~ "semna."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "�n general nu este o idee bun� s� folosi�i aceea�i cheie �i pentru\n"
+#~ "semnare �i pentru cifrare.  Acest algoritm ar trebui folosit numai\n"
+#~ "�n anumite domenii.  V� rug�m consulta�i mai �nt�i un expert �n domeniu."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Introduce�i lungimea cheii"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "R�spunde�i \"da\" sau \"nu\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Introduce�i valoarea cerut� precum a ar�tat la prompt.\n"
+#~ "Este posibil s� introduce�i o dat� ISO (AAAA-LL-ZZ) dar nu ve�i\n"
+#~ "ob�ine un r�spuns de eroare bun - �n loc sistemul �ncearc� s�\n"
+#~ "interpreteze valoare dat� ca un interval."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Introduce�i numele de�in�torului cheii"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "v� rug�m introduce�i o adres� de email (op�ional� dar recomandat�)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "V� rug�m introduce�i un comentriu op�ional"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  pentru a schimba numele.\n"
+#~ "C  pentru a schimba comentariul.\n"
+#~ "E  pentru a schimba adresa de email.\n"
+#~ "O  pentru a continua cu generarea cheii.\n"
+#~ "T  pentru a termina generarea cheii."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr ""
+#~ "R�spunde�i \"da\" (sau numai \"d\") dac� sunte�i OK s� genera�i subcheia."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "C�nd semna�i un ID utilizator pe o cheie ar trebui s� verifica�i mai "
+#~ "�nt�i\n"
+#~ "c� cheia apar�ine persoanei numite �n ID-ul utilizator.  Este util �i "
+#~ "altora\n"
+#~ "s� �tie c�t de atent a�i verificat acest lucru.\n"
+#~ "\n"
+#~ "\"0\" �nseamn� c� nu pretinde�i nimic despre c�t de atent a�i verificat "
+#~ "cheia\n"
+#~ "\"1\" �nseamn� c� crede�i c� cheia este a persoanei ce pretinde c� este\n"
+#~ "    proprietarul ei, dar n-a�i putut, sau nu a�i verificat deloc cheia.\n"
+#~ "    Aceasta este util� pentru verificare \"persona\", unde semna�i cheia\n"
+#~ "    unui utilizator pseudonim.\n"
+#~ "\n"
+#~ "\"2\" �nseamn� c� a�i f�cut o verificare supericial� a cheii.  De "
+#~ "exemplu,\n"
+#~ "    aceasta ar putea �nsemna c� a�i verificat amprenta cheii �i a�i "
+#~ "verificat\n"
+#~ "    ID-ul utilizator de pe cheie cu un ID cu poz�.\n"
+#~ "\n"
+#~ "\"3\" �nseamn� c� a�i f�cut o verificare extensiv� a cheii.  De exemplu,\n"
+#~ "    aceasta ar putea �nsemna c� a�i verificat amprenta cheii cu "
+#~ "proprietarul\n"
+#~ "    cheii �n persoan�, c� a�i verificat folosind un document dificil de\n"
+#~ "    falsificat cu poz� (cum ar fi un pa�aport) c� numele proprietarului "
+#~ "cheii\n"
+#~ "    este acela�i cu numele ID-ului utilizator al cheii �i c� a�i "
+#~ "verificat\n"
+#~ "    (schimb�nd emailuri) c� adresa de email de pe cheie apar�ine "
+#~ "proprietarului\n"
+#~ "cheii.\n"
+#~ "\n"
+#~ "De notat c� exemplele date pentru nivelele 2 �i 3 ceva mai sus sunt "
+#~ "*numai*\n"
+#~ "exemple. La urma urmei, d-voastr� decide�i ce �nseamn� \"superficial\" "
+#~ "�i\n"
+#~ "\"extensiv\" pentru d-voastr� c�nd semna�i alte chei.\n"
+#~ "\n"
+#~ "Dac� nu �ti�i care este r�spunsul, r�spunde�i \"0\"."
+
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "R�spunde�i \"da\" dac� dori�i s� semna�i TOATE ID-urile utilizator"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "R�spunde�i \"da\" dac� �ntr-adev�r dori�i s� �terge�i acest ID "
+#~ "utilizator.\n"
+#~ "Toate certificatele sunt de asemenea pierdute!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "R�spunde�i \"da\" dac� este OK s� �terge�i subcheia"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Aceasta este o semn�tur� valid� pe cheie; �n mod normal n-ar trebui\n"
+#~ "s� �terge�i aceast� semn�tur� pentru c� aceasta ar putea fi important�la "
+#~ "stabilirea conexiunii de �ncredere la cheie sau alt� cheie certificat�\n"
+#~ "de aceast� cheie."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Aceast� semn�tur� nu poate fi verificat� pentru c� nu ave�i cheia\n"
+#~ "corespunz�toare.  Ar trebui s� am�na�i �tergerea sa p�n� �ti�i care\n"
+#~ "cheie a fost folosit� pentru c� aceast� cheie de semnare ar putea\n"
+#~ "constitui o conexiune de �ncredere spre o alt� cheie deja certificat�."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "Semn�tura nu este valid�.  Aceasta ar trebui �tears� de pe inelul\n"
+#~ "d-voastr� de chei."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Aceasta este o semn�tur� care leag� ID-ul utilizator de cheie.\n"
+#~ "De obicei nu este o idee bun� s� �terge�i o asemenea semn�tur�.\n"
+#~ "De fapt, GnuPG ar putea s� nu mai poat� folosi aceast� cheie.\n"
+#~ "A�a c� face�i acest lucru numai dac� aceast� auto-semn�tur� este\n"
+#~ "dintr-o oarecare cauz� invalid� �i o a doua este disponibil�."
+
+#~ 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 ""
+#~ "Schimba�i toate preferin�ele ale tuturor ID-urilor utilizator (sau doar\n"
+#~ "cele selectate) conform cu lista curent� de preferin�e.  Timestamp-urile\n"
+#~ "tuturor auto-semn�turilor afectate vor fi avansate cu o secund�.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr ""
+#~ "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr ""
+#~ "V� rug�m repeta�i ultima fraz�-parol�, pentru a fi sigur(�) ce a�i tastat."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Da�i numele fi�ierului la care se aplic� semn�tura"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "R�spunde�i \"da\" dac� este OK s� suprascrie�i fi�ierul"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "V� rug�m introduce�i un nou nume-fi�ier. Dac� doar ap�sa�i RETURN,\n"
+#~ "va fi folosit fi�ierul implicit (ar�tat �n paranteze)."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Ar trebui s� specifica�i un motiv pentru certificare.  �n func�ie de\n"
+#~ "context ave�i posibilitatea s� alege�i din aceast� list�:\n"
+#~ "  \"Cheia a fost compromis�\"\n"
+#~ "      Folosi�i aceast� op�iune dac� ave�i un motiv s� crede�i c� "
+#~ "persoane\n"
+#~ "      neautorizate au avut acces la cheia d-voastr� secret�.\n"
+#~ "  \"Cheia este �nlocuit�\"\n"
+#~ "      Folosi�i aceast� op�iune dac� �nlocui�i cheia cu una nou�.\n"
+#~ "  \"Cheia nu mai este folosit�\"\n"
+#~ "      Folosi�i aceast� op�iune dac� pensiona�i cheia.\n"
+#~ "  \"ID-ul utilizator nu mai este valid\"\n"
+#~ "      Folosi�i aceast� op�iune dac� ID-ul utilizator nu mai trebuie "
+#~ "folosit;\n"
+#~ "      de obicei folosit� pentru a marca o adres� de email ca invalid�.\n"
+
+#~ 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 ""
+#~ "Dac� dori�i, pute�i introduce un text descriind de ce publica�i acest\n"
+#~ "certificat de revocare.  V� rug�m fi�i concis.\n"
+#~ "O linie goal� termin� textul.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "nu pot pune date notare �n semn�turi v3 (stil PGP 2.x)\n"
 
@@ -8305,9 +8560,6 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 #~ msgid "Enter Admin PIN: "
 #~ msgstr "Introduce�i PIN Admin: "
 
-#~ msgid "Enter PIN: "
-#~ msgstr "Introduce�i PIN: "
-
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "NOT�: %s nu este disponibil �n aceast� sesiune\n"
 
@@ -8321,9 +8573,6 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 #~ msgid "unknown packet type"
 #~ msgstr "tip de pachet necunoscut"
 
-#~ msgid "unknown version"
-#~ msgstr "versiune necunoscut�"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "algoritm pubkey necunoscut"
 
@@ -8438,9 +8687,6 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 #~ msgid "network error"
 #~ msgstr "eroare re�ea"
 
-#~ msgid "not encrypted"
-#~ msgstr "necifrat"
-
 #~ msgid "not processed"
 #~ msgstr "neprocesat"
 
@@ -8654,9 +8900,6 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 #~ msgid "preference %c%lu is not valid\n"
 #~ msgstr "preferin�a %c%lu nu este valid�\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (semnare �i cifrare)\n"
-
 #~ msgid ""
 #~ "About to generate a new %s keypair.\n"
 #~ "              minimum keysize is  768 bits\n"
diff --git a/po/ru.po b/po/ru.po
index ffbbe60ad..1e977eea6 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -40,46 +40,46 @@ msgstr "Введите фразу-пароль для доступа к закр
 msgid "Quality:"
 msgstr "достоверность: %s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 msgid "PIN too long"
 msgstr "PIN слишком длинен"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 msgid "Passphrase too long"
 msgstr "фраза-пароль слишком длинная"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 msgid "Invalid characters in PIN"
 msgstr "Недопустимый символ в PIN-коде"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr "PIN-код слишком короткий"
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 msgid "Bad PIN"
 msgstr "плохой PIN"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 msgid "Passphrase"
 msgstr "Фраза-пароль"
 
@@ -88,21 +88,21 @@ msgstr "Фраза-пароль"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "не поддерживаются ssh ключи превышающие %d бит\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -183,8 +183,8 @@ msgstr "повторный PIN не совпал; попробуйте еще р
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Введите PIN%s%s%s для доступа к карте"
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "ошибка создания временного файла: %s\n"
@@ -260,7 +260,7 @@ msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -277,13 +277,13 @@ msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (background)"
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "подробно"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
@@ -360,8 +360,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние в файл"
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "О найденных ошибках сообщайте <"
 
@@ -377,29 +377,30 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba слишком устаревшая (требуется %s, имеется %s)\n"
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
@@ -510,12 +511,12 @@ msgstr "%s %s: остановлен\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -587,7 +588,7 @@ msgstr "отменено\n"
 msgid "error opening `%s': %s\n"
 msgstr "ошибка открытия `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "файл `%s', строка %d: %s\n"
@@ -612,7 +613,7 @@ msgstr "недопустимый отпечаток в `%s', строка %d\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "ошибка чтения `%s', строка %d: %s\n"
@@ -837,6 +838,145 @@ msgstr "выход за безопасный предел памяти при р
 msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при распределении %lu байтов"
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr "нет работающих gpg-agent - запускаем\n"
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr "невозможно подключиться к агенту - пробуем откатиться назад\n"
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "цепочка сертификации слишком длинная\n"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "корневой сертификат не помечен доверяемым"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "вывести все доступные данные"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: таблица ключей создана\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "достоверность: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Поддерживаются следующие алгоритмы:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "(это не похоже не зашифрованное сообщение)\n"
+
+#: common/audit.c:740
+#, fuzzy
+msgid "Number of recipients"
+msgstr "Текущие получатели:\n"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "проверка подписи подавлена\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Подпись сделана"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "подпись не найдена\n"
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "недопустимая хэш-функция `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Подпись сделана"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "сертификат еще не достоверен"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "корневой сертификат не помечен доверяемым"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "не найдена CRL для сертификата"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "экспорт сертификатов"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "неизвестный параметр `%s'\n"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Нет справки для `%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "ошибка в строке дополнения\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -956,13 +1096,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
@@ -1129,7 +1269,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
@@ -1233,18 +1373,18 @@ msgstr "Недопустимая команда  (список команд: \"h
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1286,7 +1426,7 @@ msgstr ""
 "сначала воспользуйтесь \"--delete-secret-keys\" для удаления закрытого "
 "ключа.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка создания фразы-пароля: %s\n"
@@ -1305,7 +1445,7 @@ msgstr "использутся алгоритм шифрования %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
@@ -1331,7 +1471,7 @@ msgid ""
 msgstr ""
 "ВНИМАНИЕ: использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1358,18 +1498,18 @@ msgstr "%s/%s зашифровано для: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "Данные зашифрованы алгоритмом %s\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ВНИМАНИЕ: сообщение было зашифровано слабым ключом симметричного шифра.\n"
 
-#: g10/encr-data.c:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "проблема обработки зашифрованного пакета\n"
 
@@ -1512,7 +1652,7 @@ msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
@@ -1527,7 +1667,7 @@ msgstr "использую подклключ %s вместо главного �
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1543,27 +1683,27 @@ msgstr "|[файл]|создать подпись к файлу"
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "вывести список ключей"
 
@@ -1575,11 +1715,11 @@ msgstr "вывести список ключей и подписей"
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
@@ -1615,11 +1755,11 @@ msgstr "создать сертификат отзыва"
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
@@ -1655,11 +1795,11 @@ msgstr "обновить таблицу доверий"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [файлы]|вывести хэши файлов"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1670,32 +1810,32 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (0 без сжатия)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
@@ -1711,7 +1851,7 @@ msgstr "строго следовать стандарту OpenPGP"
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1719,7 +1859,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1757,7 +1897,7 @@ msgstr ""
 "Подписи и их проверка, зашифрование и расшифрование\n"
 "действие по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1777,11 +1917,11 @@ msgstr "Симметричные шифры: "
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1789,7 +1929,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [параметры] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
@@ -1869,454 +2009,454 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа у каталогу содержащего файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr "отображать Фото ID при распечатке ключей"
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr "показывать ссылку на политики при распечатке подписей"
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 msgid "show all notations during signature listings"
 msgstr "показывать все примечания в списке подписей"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "показывать добавленные пользователем примечания при распечатке подписей"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показываеть предпочитаемый сервер ключей с списке подписей"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr "показывать действительность Used ID при распечатке ключей"
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr "показывать отозванные и просроченные User ID при распечатке ключей"
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать отозванные и просроченные ключи при распечатке списка"
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 msgid "show the keyring name in key listings"
 msgstr "печатать имя таблиц ключей в списке ключей"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 msgid "show expiration dates during signature listings"
 msgstr "печатать даты истечения в списке подписей"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr "показывать Фото ID при проверке подписи"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr "показывать ссылку на политики при проверке подписи"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 msgid "show all notations during signature verification"
 msgstr "показывать все примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr "показывать добавленные пользователем примечания при проверке подписей"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 msgid "show user ID validity during signature verification"
 msgstr "печатать действительность UserID при проверке подписей"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "показывать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2970
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2976
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:2989
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3212
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3217
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[файл]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -2328,7 +2468,7 @@ msgstr "используются ключи из этой таблицы клю�
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии отметки времени - только предупреждением"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
@@ -2344,334 +2484,11 @@ msgstr ""
 "Синтаксис: gpg [параметры] [файлы]\n"
 "Проверка подписей сделанных доверяемыми ключами\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Вы должны ввести здесь значение; оно никогда не будет экспортировано\n"
-"третьей стороне.  Это необходимо для реализации Сети Доверия;\n"
-"и не имеет ничего общего с (неявно созданной) сетью сертификатов."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Для построения Сети Доверия, GnuPG должен знать, к каким ключам\n"
-"имеется абсолютное доверие - обычно это ключи для которых у Вас есть\n"
-"секретный ключ.  Ответьте \"yes\" для присвоения абсолютного доверия\n"
-"данному ключу\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "Если хотите использовать данный недоверяемый ключ - ответьте \"yes\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Введите User ID адресата, которому хотите отправить сообщение."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"Выберите алгоритм.\n"
-"\n"
-"DSA (aka DSS) - Digital Signature Algorithm может использоваться\n"
-"только для подписей.\n"
-"\n"
-"Elgamal - алгоритм используемый только для шифрования.\n"
-"\n"
-"RSA может использоваться и для подписи, и для шифрования.\n"
-"\n"
-"Первый (он же главный) ключ всегда должен быть подписывающим."
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"Обычно не рекомендуется использовать один ключ и для подписи, и для "
-"шифрования.\n"
-"Данный алгоритм следует использовтаь только в некоторых случаях.\n"
-"Проконсультируйтесь с Вашим экспертом по безопасности перед тем,\n"
-"как использовать данный ключ."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Введите размер ключа"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Ответьте \"yes\" или \"no\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Введите требуемое значение, как показано в подсказке.\n"
-"Можно ввести дату в ISO формате (YYYY-MM-DD), но Вы не получите\n"
-"уведомление при ошибке в формате - вместо этого система попробует\n"
-"интерпретировать введенное значение как интервал."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Введите имя владельца ключа"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "введите необязательный, но очень рекомендуемый email адрес"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Введите необязательный комментарий"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  изменить имя.\n"
-"C  изменить комментарий.\n"
-"E  изменить email адрес.\n"
-"O  продолжить создание ключа.\n"
-"Q  выйти и прервать создание ключа."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Ответьте \"yes\" (или только \"y\"), если готовы создавать подключ."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Перед подписыванием User ID ключа, следует прежде удостовериться, что\n"
-"ключ действительно принадлежит человеку указанному в User ID. Это очень "
-"важно\n"
-"для тех, кто учитывает как хорошо Вы проверяете достоверность User ID.\n"
-"\n"
-"\"0\" означает, что Вы не можете сказать, как хорошо Вы проверили ключ.\n"
-"\"1\" означает, что Вы полагаете, что ключ принадлежит человеку, который\n"
-"    указан в нем, но Вы не могли или не проводили проверку ключа совсем.\n"
-"    Это полезно, когда Вы подписываете ключ с псевдонимом человека.\n"
-"\n"
-"\"2\" означает, что Вы делали неаккуратную проверку ключа.  Например, это "
-"может\n"
-"    означать, что Вы проверили отпечаток ключа и проверили User ID на\n"
-"    ключе на основании фото ID.\n"
-"\n"
-"\"3\" означает, что Вы выполнили всестороннюю проверку ключа.  Например, это "
-"может\n"
-"    означать, что Вы сверили отпечаток ключа с владельцем ключа лично\n"
-"    и что Вы сверили всё посредством трудноподделываемого документа с\n"
-"    фотографией (таким как паспорт), что имя владельца ключа совпадает с\n"
-"    именем в User ID ключа и наконец, что Вы проверили (обменом "
-"шифрованными\n"
-"    письмами), что email адрес на ключе принадлежит владельцу ключа.\n"
-"\n"
-"Учтите, что примеры данные для уровней 2 и 3 - только примеры.\n"
-"В конечном итоге, Вам решать, как классифицировать \"неаккуратно\" и "
-"\"всесторонне\",\n"
-"при подписывании чужих ключей.\n"
-"\n"
-"Если Вы не можете определиться с правильным ответом, ответьте \"0\"."
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "Ответьте \"yes\", если хотите подписать ВСЕ User ID"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Ответьте \"yes\", если действительно хотите удалить данный User ID.\n"
-"Все сертификаты также будут потеряны!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Ответьте \"yes\", если готовы удалить подключ"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Это действительная подпись на ключе; обычно не желательно\n"
-"удалять такие подписи, потому, что она может быть важна для установления\n"
-"достоверности ключа или других ключей подписанных данным ключом."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Данная подпись не может быть проверена потому, что Вы не имеете\n"
-"соответствующего ключа.  Можете отложить ее удаление, пока не\n"
-"узнаете, какой ключ был использован, т.к. эта подпись может\n"
-"устанавливать достоверность через другие уже удостоверенные ключи."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-"Подпись недействительна.  Это дает основания удалить ее из\n"
-"связки ключей."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Данная подпись является самоподписью и привязывает User ID к ключу.\n"
-"Обычно это плохая идея удалить такую подпись.  На самом деле\n"
-"GnuPG может не позволить использовать такой ключ далее.\n"
-"Делайте это только если данная самоподпись не действительна по\n"
-"каким-либо причинам и существует доступная вторая."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Изменение предпочтений для всех User ID (или только для выбранных)\n"
-"на текущий список предпочтений.  Отметка времени на всех затронутых\n"
-"самоподписях будет увеличена на одну секунду.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Введите фразу-пароль (это секретная строка) \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-"Повторите фразу-пароль, чтобы убедиться в том, что она набрана правильно."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Введите имя файла, к которому относится данная подпись"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Ответьте \"yes\", если хотите перезаписать файл"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Введите новое имя файла. Если нажмете только RETURN будет использован\n"
-"по умолчанию тот файл, который показан в квадратных скобках."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Сейчас сможете указать причину отзыва ключа.  Основываясь на \n"
-"контексте отзыва - можете выбрать один из следующих вариантов:\n"
-"  \"Ключ был скомпрометирован\"\n"
-"      Выберите, если предполагаете, что посторонний человек\n"
-"      получил доступ к Вашему секретному ключу.\n"
-"  \"Ключ заменен другим\"\n"
-"      Выберите, если заменяете данный ключ на другой.\n"
-"  \"Ключ больше не используется\"\n"
-"      Выберите, если отказываетесь от использования данного ключа.\n"
-"  \"User ID больше не действителен\"\n"
-"      Выберите, если больше не собираетесь использовать данный User ID.\n"
-"      Обычно используется, для указания, что данный e-mail больше\n"
-"      не используется\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"При необходимости здесь можно прокомментировать причины\n"
-"создания сертификата отзыва.  Будьте кратки.\n"
-"Для завершения введите пустую строку.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Нет доступной справки"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Нет справки для `%s'"
@@ -2870,13 +2687,13 @@ msgstr "ключ %s: новый ключ - пропущен\n"
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
@@ -2965,7 +2782,7 @@ msgstr "ключ %s: секретный ключ с недопустимым ш�
 msgid "importing secret keys not allowed\n"
 msgstr "импортирование секретного ключа не позволено\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
@@ -3419,8 +3236,8 @@ msgstr "Я очень тщательно проверил этот ключ.\n"
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
@@ -3429,19 +3246,19 @@ msgstr "не удалось подписать: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
@@ -3458,7 +3275,7 @@ msgstr ""
 "Введите новую фразу-пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод фразы-пароля некорректен; попробуйте еще раз"
 
@@ -3791,91 +3608,91 @@ msgstr "сбой при обновлений секретного ключа: %s
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Опции: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 msgid "Notations: "
 msgstr "Примечания: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2698
+#: g10/keyedit.c:2699
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2720
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3883,17 +3700,17 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока программа не будет перезапущена.\n"
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "просрочен с"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -3901,7 +3718,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный. Данная команда может\n"
 "              воспользоваться другим user ID, используя его как главный.\n"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3910,74 +3727,74 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Нельзя добавлять фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "недопустимый"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3986,187 +3803,187 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Нельзя добавлять назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3426
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3448
+#: g10/keyedit.c:3449
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3474
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Нельзя изменять срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "подписываемый подключ %s уже имеет перекрестную сертификацию\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "подключ %s не подписывающий и не нуждается в перекрестной подписи\n"
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 msgid "Enter the notation: "
 msgstr "Введите примечание:"
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 msgid "Proceed? (y/N) "
 msgstr "Обработать? (y/N) "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
@@ -4206,12 +4023,12 @@ msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
@@ -4239,109 +4056,119 @@ msgstr "Зашифровать"
 msgid "Authenticate"
 msgstr "Атентифицировать"
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Возможные действия для ключа %s:"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "Допустимы действия:"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Переключить возможность использования для подписи\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Переключить возможность использования для шифрования\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Переключить возможность использования для аутентификации\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите требуемый тип ключа:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (только для шифрования)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключи %s могут иметь длину от %u до %u бит.\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа необходим? (%u) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "размер ключей %s должен быть в пределах %u-%u\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрашиваемый размер ключа %u бит\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4357,7 +4184,7 @@ msgstr ""
 "      <n>m = срок действительности n месяцев\n"
 "      <n>y = срок действительности n лет\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4373,38 +4200,38 @@ msgstr ""
 "      <n>m = срок действительности подписи n месяцев\n"
 "      <n>y = срок действительности подписи n лет\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпись действительна до? (%s) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "Ключ не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "Подпись не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до: %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до: %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4412,11 +4239,11 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, даты не превышающие 2106 будут обработаны корректно.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4431,44 +4258,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используемая таблица символов: `%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4479,7 +4306,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
 
@@ -4494,24 +4321,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват�
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4519,12 +4346,12 @@ msgstr ""
 "Для защиты секретного ключа необходима фраза-пароль.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4536,7 +4363,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4549,50 +4376,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 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"
@@ -4600,44 +4427,44 @@ msgstr ""
 "Учтите, данный ключ не может использоваться для шифрования.  Можно\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, 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:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, 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:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "ЗАМЕЧАНИЕ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: архивная копия ключа карты сохранена в `%s'\n"
@@ -4934,190 +4761,190 @@ msgstr "фраза-пароль создана с незнакомой хеш-ф
 msgid "public key is %s\n"
 msgstr "открытый ключ %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: правильный DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s, с ID %s, созданным %s\n"
 
-#: g10/mainproc.c:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с ID %s\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифрования с открытым ключом: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано с %lu фразами-паролями\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано с 1 фразой-паролем\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "принятие %s зашифрованных данных\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробуйте использовать взамен %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "расшифровано\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ВНИМАНИЕ: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ВНИМАНИЕ: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАМЕЧАНИЕ: отправитель требует \"только для просмотра Вами\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "оригинальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 msgid "no signature found\n"
 msgstr "подпись не найдена\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать эти множественные подписи\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись создана %s ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Ключ доступен на:"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись от  \"%s\""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -5138,83 +4965,88 @@ msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм %s шифрования с открытым "
 "ключом\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 "ВНИМАНИЕ: используется экспериментальный алгоритм симметричного шифрования %"
 "s\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "ВНИМАНИЕ: используется экспериментальная хеш-функция %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "модуль поддержки шифра IDEA не обнаружен\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "для дополнительной информации см. %s\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте \"%s%s\" взамен\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "ВНИМАНИЕ: команда \"%s\" является устаревшей - не следует применять ее\n"
 
-#: g10/misc.c:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Без сжатия"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
@@ -5976,11 +5808,11 @@ msgstr "сбой проверки созданной подписи: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
 
-#: g10/sign.c:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5988,15 +5820,15 @@ msgstr ""
 "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
@@ -6315,7 +6147,7 @@ msgstr "абсолютное"
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
@@ -6343,27 +6175,27 @@ msgstr "выполните --check-trustdb, пожалуйста\n"
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d действующих записей очищено)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %s не найден\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d ограниченных необходимо, %d выполненных необходимо, %s модель доверия\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6371,7 +6203,7 @@ msgstr ""
 "глубина: %d  корректных: %3d  подписанных: %3d  доверия: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6510,12 +6342,12 @@ msgstr ""
 "Синтаксис: kbxutil [параметры] [файлы]\n"
 "просморт, экспорт, импорт данных Keybox\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6576,11 +6408,11 @@ msgstr "при проверке CHV%d сбой: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
@@ -6688,13 +6520,13 @@ msgstr "карта не поддерживает функцию хеширова
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещена этой командой\n"
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
@@ -6703,7 +6535,7 @@ msgstr "нет доступа %s - неработоспособная карта
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 msgid "read options from file"
 msgstr "получение параметров конфигурации из файла"
 
@@ -6763,21 +6595,21 @@ msgstr "обработчик fd %d остановлен\n"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "недопустимый символ radix64 %02X пропущен\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "нет запущеного dirmngr - запуск `%s'\n"
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "протокол dirmngr версии %d не поддерживается\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "не могу подсоединиться к dirmngr - пытаемся откатиться назад\n"
 
@@ -6786,11 +6618,11 @@ msgstr "не могу подсоединиться к dirmngr - пытаемся
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 msgid "shell"
 msgstr ""
 
@@ -6829,8 +6661,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr "число совпавших издателей: %d\n"
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr ""
 
@@ -6960,60 +6792,60 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "не найден издатель в сертификате"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr "самоподписанный\tсертификат имеет ПЛОХУЮ подпись"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr "корневой сертификат не помечен доверяемым"
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "сбой проверки списка доверий: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "цепочка сертификации слишком длинная\n"
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr "не найден издатель сертификата"
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 msgid "certificate has a BAD signature"
 msgstr "сертификат имеет ПЛОХУЮ подпись"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr "найдено еще одно соответствие CA  сертификата - повторная попытки"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "цепочка сертификации длиннее дозволенной CA (%d)"
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "цепочка сертификации слишком длинная\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "дупликат сертификата `%s' удален\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "корневой сертификат не помечен доверяемым"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7028,7 +6860,7 @@ msgstr "ключ DSA %s использует небезопасный (%u бит
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(это MD2 алгоритм)\n"
 
@@ -7145,6 +6977,111 @@ msgstr "строка %d: ошибка получения keygrip ключа `%s'
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "строка %d: cбой создания ключа: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (только для подписи)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (2) Ключ шифрования\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, fuzzy, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "Возможные действия для ключа %s:"
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) DSA (только для подписи)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (только для подписи)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (только для шифрования)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(Пояснения отсутствуют)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "недопустимая хэш-функция `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "Email-адрес: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Введите User ID.  Пустая строка для завершения: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Введите новое имя файла"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Введите необязательное пояснение; закончите пустой строкой:\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(это RC2 алгоритм)\n"
@@ -7178,185 +7115,185 @@ msgstr "сертификат `%s' удален\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "удаление сертификата \"%s\" неудачно: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 msgid "no valid recipients given\n"
 msgstr "не заданы получатели\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 msgid "|[FILE]|make a signature"
 msgstr "|[файл]|создать подпись"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[файл]|создать прозрачную подпись"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 msgid "list external keys"
 msgstr "вывести список внешних ключей"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 msgid "list certificate chain"
 msgstr "вывести список правил сертификатов"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 msgid "remove key from the public keyring"
 msgstr "удалить ключ из таблицы открытых ключей"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 msgid "import certificates"
 msgstr "импорт сертификатов"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 msgid "export certificates"
 msgstr "экспорт сертификатов"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr "зарегистрировать смарткарту"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr "передать команду dirmngr"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr "вызываем gpg-protect-tool"
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 msgid "change a passphrase"
 msgstr "сменить фразу-пароль"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 msgid "create base-64 encoded output"
 msgstr "вывод в BASE64"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr "предполагаем получение в формате PEM"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr "предполагаем получение в формате BASE64"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr "предполагаем получение в двоичном формате"
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr "используем системный dirmngr, если доступен"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr "не сверять с CRL"
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr "проверка действительности используя OCSP"
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr "|N|число включаемых сертификатов"
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|взять информацию о политиках из FILE"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr "не проверять политики сертификата"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr "запросить пропущенных издаталей сертификатов"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|использовать NAME как получателя по умолчанию"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "использовать ключ по умолчанию как получателя по умолчанию"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "не использовать терминал совсем"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 #, fuzzy
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в FILE"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в FILE"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "принудительная подпись v3"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "всегда использовать MDC для шифрования"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "пакетный режим: ничего не запрашивать"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "предполагать Да на большинство вопросов"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "предполагать Нет на большинство вопросов"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "добавить данную таблицу ключей в список таблиц ключей"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "добавить данную таблицу секретных ключей в список"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|использовать NAME как секретный ключ по умолчанию"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|использовать данный сервер ключей для поиска ключей"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|установить кодировку терминала в NAME"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|установить уровень отладки в LEVEL"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|загрузить модуль дополнения FILE"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|использовать алгоритм шифрования NAME"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|использовать хеш-функцию NAME"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|использовать алгоритм сжатия N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Использование: gpgsm [параметры] [файлы] (-h для подсказки)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7367,35 +7304,35 @@ msgstr ""
 "протокол\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 msgid "usage: gpgsm [options] "
 msgstr "использование: gpgsm [параметры] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "не могу зашифровать для `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "невозможно подписать используя `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr "данная команды всё еще не реализована\n"
 
@@ -7500,7 +7437,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7521,28 +7458,28 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 msgid "Signature made "
 msgstr "Подпись сделана"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr "[дата не указана]"
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "с использованием сертификата ID %08lX\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 msgid "Good signature from"
 msgstr "Действительная подпись от"
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 msgid "                aka"
 msgstr "                aka"
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Это будет самоподпись.\n"
@@ -7997,6 +7934,317 @@ msgstr "не задан класс\n"
 msgid "class %s is not supported\n"
 msgstr "класс %s не поддерживается\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Использование: gpg-connect-agent [параметры] (-h для подсказки)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Вы должны ввести здесь значение; оно никогда не будет экспортировано\n"
+#~ "третьей стороне.  Это необходимо для реализации Сети Доверия;\n"
+#~ "и не имеет ничего общего с (неявно созданной) сетью сертификатов."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Для построения Сети Доверия, GnuPG должен знать, к каким ключам\n"
+#~ "имеется абсолютное доверие - обычно это ключи для которых у Вас есть\n"
+#~ "секретный ключ.  Ответьте \"yes\" для присвоения абсолютного доверия\n"
+#~ "данному ключу\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Если хотите использовать данный недоверяемый ключ - ответьте \"yes\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "Введите User ID адресата, которому хотите отправить сообщение."
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "Выберите алгоритм.\n"
+#~ "\n"
+#~ "DSA (aka DSS) - Digital Signature Algorithm может использоваться\n"
+#~ "только для подписей.\n"
+#~ "\n"
+#~ "Elgamal - алгоритм используемый только для шифрования.\n"
+#~ "\n"
+#~ "RSA может использоваться и для подписи, и для шифрования.\n"
+#~ "\n"
+#~ "Первый (он же главный) ключ всегда должен быть подписывающим."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "Обычно не рекомендуется использовать один ключ и для подписи, и для "
+#~ "шифрования.\n"
+#~ "Данный алгоритм следует использовтаь только в некоторых случаях.\n"
+#~ "Проконсультируйтесь с Вашим экспертом по безопасности перед тем,\n"
+#~ "как использовать данный ключ."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Введите размер ключа"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Ответьте \"yes\" или \"no\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Введите требуемое значение, как показано в подсказке.\n"
+#~ "Можно ввести дату в ISO формате (YYYY-MM-DD), но Вы не получите\n"
+#~ "уведомление при ошибке в формате - вместо этого система попробует\n"
+#~ "интерпретировать введенное значение как интервал."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Введите имя владельца ключа"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "введите необязательный, но очень рекомендуемый email адрес"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Введите необязательный комментарий"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  изменить имя.\n"
+#~ "C  изменить комментарий.\n"
+#~ "E  изменить email адрес.\n"
+#~ "O  продолжить создание ключа.\n"
+#~ "Q  выйти и прервать создание ключа."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Ответьте \"yes\" (или только \"y\"), если готовы создавать подключ."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Перед подписыванием User ID ключа, следует прежде удостовериться, что\n"
+#~ "ключ действительно принадлежит человеку указанному в User ID. Это очень "
+#~ "важно\n"
+#~ "для тех, кто учитывает как хорошо Вы проверяете достоверность User ID.\n"
+#~ "\n"
+#~ "\"0\" означает, что Вы не можете сказать, как хорошо Вы проверили ключ.\n"
+#~ "\"1\" означает, что Вы полагаете, что ключ принадлежит человеку, который\n"
+#~ "    указан в нем, но Вы не могли или не проводили проверку ключа совсем.\n"
+#~ "    Это полезно, когда Вы подписываете ключ с псевдонимом человека.\n"
+#~ "\n"
+#~ "\"2\" означает, что Вы делали неаккуратную проверку ключа.  Например, это "
+#~ "может\n"
+#~ "    означать, что Вы проверили отпечаток ключа и проверили User ID на\n"
+#~ "    ключе на основании фото ID.\n"
+#~ "\n"
+#~ "\"3\" означает, что Вы выполнили всестороннюю проверку ключа.  Например, "
+#~ "это может\n"
+#~ "    означать, что Вы сверили отпечаток ключа с владельцем ключа лично\n"
+#~ "    и что Вы сверили всё посредством трудноподделываемого документа с\n"
+#~ "    фотографией (таким как паспорт), что имя владельца ключа совпадает с\n"
+#~ "    именем в User ID ключа и наконец, что Вы проверили (обменом "
+#~ "шифрованными\n"
+#~ "    письмами), что email адрес на ключе принадлежит владельцу ключа.\n"
+#~ "\n"
+#~ "Учтите, что примеры данные для уровней 2 и 3 - только примеры.\n"
+#~ "В конечном итоге, Вам решать, как классифицировать \"неаккуратно\" и "
+#~ "\"всесторонне\",\n"
+#~ "при подписывании чужих ключей.\n"
+#~ "\n"
+#~ "Если Вы не можете определиться с правильным ответом, ответьте \"0\"."
+
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Ответьте \"yes\", если хотите подписать ВСЕ User ID"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Ответьте \"yes\", если действительно хотите удалить данный User ID.\n"
+#~ "Все сертификаты также будут потеряны!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Ответьте \"yes\", если готовы удалить подключ"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Это действительная подпись на ключе; обычно не желательно\n"
+#~ "удалять такие подписи, потому, что она может быть важна для установления\n"
+#~ "достоверности ключа или других ключей подписанных данным ключом."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Данная подпись не может быть проверена потому, что Вы не имеете\n"
+#~ "соответствующего ключа.  Можете отложить ее удаление, пока не\n"
+#~ "узнаете, какой ключ был использован, т.к. эта подпись может\n"
+#~ "устанавливать достоверность через другие уже удостоверенные ключи."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "Подпись недействительна.  Это дает основания удалить ее из\n"
+#~ "связки ключей."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Данная подпись является самоподписью и привязывает User ID к ключу.\n"
+#~ "Обычно это плохая идея удалить такую подпись.  На самом деле\n"
+#~ "GnuPG может не позволить использовать такой ключ далее.\n"
+#~ "Делайте это только если данная самоподпись не действительна по\n"
+#~ "каким-либо причинам и существует доступная вторая."
+
+#~ 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 ""
+#~ "Изменение предпочтений для всех User ID (или только для выбранных)\n"
+#~ "на текущий список предпочтений.  Отметка времени на всех затронутых\n"
+#~ "самоподписях будет увеличена на одну секунду.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Введите фразу-пароль (это секретная строка) \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr ""
+#~ "Повторите фразу-пароль, чтобы убедиться в том, что она набрана правильно."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Введите имя файла, к которому относится данная подпись"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Ответьте \"yes\", если хотите перезаписать файл"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Введите новое имя файла. Если нажмете только RETURN будет использован\n"
+#~ "по умолчанию тот файл, который показан в квадратных скобках."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Сейчас сможете указать причину отзыва ключа.  Основываясь на \n"
+#~ "контексте отзыва - можете выбрать один из следующих вариантов:\n"
+#~ "  \"Ключ был скомпрометирован\"\n"
+#~ "      Выберите, если предполагаете, что посторонний человек\n"
+#~ "      получил доступ к Вашему секретному ключу.\n"
+#~ "  \"Ключ заменен другим\"\n"
+#~ "      Выберите, если заменяете данный ключ на другой.\n"
+#~ "  \"Ключ больше не используется\"\n"
+#~ "      Выберите, если отказываетесь от использования данного ключа.\n"
+#~ "  \"User ID больше не действителен\"\n"
+#~ "      Выберите, если больше не собираетесь использовать данный User ID.\n"
+#~ "      Обычно используется, для указания, что данный e-mail больше\n"
+#~ "      не используется\n"
+
+#~ 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 ""
+#~ "При необходимости здесь можно прокомментировать причины\n"
+#~ "создания сертификата отзыва.  Будьте кратки.\n"
+#~ "Для завершения введите пустую строку.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "невозможно добавить примечение в v3 (PGP 2.x стиля) подпись\n"
 
@@ -8014,12 +8262,6 @@ msgstr "класс %s не поддерживается\n"
 #~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
 #~ msgstr "для дополнительной информации см. %s\n"
 
-#~ msgid "no running gpg-agent - starting one\n"
-#~ msgstr "нет работающих gpg-agent - запускаем\n"
-
-#~ msgid "can't connect to the agent - trying fall back\n"
-#~ msgstr "невозможно подключиться к агенту - пробуем откатиться назад\n"
-
 #, fuzzy
 #~ msgid "key generation is not available from the commandline\n"
 #~ msgstr "gpg-agent недоступен в данной сессии\n"
diff --git a/po/sk.po b/po/sk.po
index 52c240bfc..357450a9f 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -37,51 +37,51 @@ msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 msgid "Quality:"
 msgstr ""
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve mene\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nespr�vne MPI"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nespr�vne heslo"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "nespr�vne heslo"
@@ -91,21 +91,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -187,8 +187,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -267,7 +267,7 @@ msgid "Please enter the new passphrase"
 msgstr "zmeni� heslo"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -286,13 +286,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
@@ -374,8 +374,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -393,29 +393,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
@@ -527,12 +528,12 @@ msgstr "%s: presko�en�: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -603,7 +604,7 @@ msgstr "Zru�i�"
 msgid "error opening `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
@@ -628,7 +629,7 @@ msgstr "chyba pri ��tan�: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -855,6 +856,144 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "nespr�vny certifik�t"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "nespr�vny certifik�t"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "K��� k dispoz�cii na: "
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "ASCII k�dovanie: %s\n"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Podporovan� algoritmy:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "neza�ifrovan�"
+
+#: common/audit.c:740
+msgid "Number of recipients"
+msgstr ""
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "verifik�cia podpisu potla�en�\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Platnos� podpisu vypr�ala %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "Dobr� podpis od \""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "neplatn� hashovac� algoritmus `%s'\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Platnos� podpisu vypr�ala %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "Platnos� k���a vypr�ala!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "nespr�vny certifik�t"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "nespr�vny certifik�t"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "nespr�vny certifik�t"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "nezn�ma verzia"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Pomoc nie je dostupn� pre '%s'"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "chyba v p�ti�ke\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -977,14 +1116,14 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
@@ -1163,7 +1302,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
@@ -1280,18 +1419,18 @@ msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1334,7 +1473,7 @@ msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -1353,7 +1492,7 @@ msgstr "pou�it� �ifra %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
@@ -1379,7 +1518,7 @@ 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:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1409,18 +1548,18 @@ msgstr "%s/%s za�ifrovan� pre: %s\n"
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� d�ta\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "probl�m so za�ifrovan�m paketom\n"
 
@@ -1573,7 +1712,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
@@ -1588,7 +1727,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1604,27 +1743,27 @@ msgstr "|[s�bor]|vytvori� podpis"
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
@@ -1637,11 +1776,11 @@ msgstr "vyp�sa� zoznam k���ov a podpisov"
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
@@ -1677,11 +1816,11 @@ msgstr "vytvori� revoka�n� certifik�t"
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
@@ -1717,11 +1856,11 @@ msgstr "aktualizova� datab�zu d�very"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1732,36 +1871,36 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 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:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
@@ -1777,7 +1916,7 @@ msgstr ""
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1786,7 +1925,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1826,7 +1965,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1846,11 +1985,11 @@ msgstr "�ifry: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1858,7 +1997,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
@@ -1932,471 +2071,471 @@ 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:1492
+#: g10/gpg.c:1528
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, 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:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, 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:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, 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:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 #, 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 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:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -2409,7 +2548,7 @@ msgstr "Zmaza� tento k��� zo s�boru k���ov? "
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
@@ -2425,327 +2564,11 @@ msgstr ""
 "Syntax: gpg [nastavenia] [s�bory]\n"
 "Skontroluje podpisy oproti zn�mym d�veryhodn�m k���om\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Je na V�s, aby ste sem priradili hodnotu; t�to hodnota nebude nikdy\n"
-"exportovan� tretej strane. Potrebujeme ju k implement�cii \"pavu�iny\n"
-"d�very\"; nem� to ni� spolo�n� s (implicitne vytvorenou) \"pavu�inou\n"
-"certifik�tov\"."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Aby bolo mo�n� vybudova� pavu�inu d�very, mus� GnuPG vedie�, ktor�m k���om\n"
-"d�verujete absol�tne - oby�ajne s� to tie k���e, pre ktor� m�te pr�stup\n"
-"k tajn�m k���om. Odpovedzte \"ano\", aby ste nastavili tieto k���e\n"
-"ako absol�tne d�veryhodn�\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Pokia� aj tak chcete pou�i� tento ned�veryhodn� k���, odpovedzte \"ano\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Vlo�te identifik�tor adres�ta, ktor�mu chcete posla� spr�vu."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"V�ebecne nemo�no odpor��a� pou��va� rovnak� k��� na �ifrovanie a "
-"podeisovanie\n"
-"Tento algoritmus je vhodn� pou�i� len za ur�it�ch podmienok.\n"
-"Kontaktujte pros�m najprv bezpe�nostn�ho �pecialistu."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Vlo�te d�ku k���a"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Odpovedzte \"ano\" alebo \"nie\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Vlo�te po�adovan� hodnotu tak, ako je uveden� v pr�kazovom riadku.\n"
-"Je mo�n� vlo�i� d�tum vo form�te ISO (RRRR-MM-DD), ale nedostanete\n"
-"spr�vnu chybov� hl�ku - miesto toho syst�m sk�si interpretova�\n"
-"zadan� hodnotu ako interval."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Vlo�te meno dr�ite�a k���a"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "pros�m, vlo�te e-mailov� adresu (nepovinn�, ale ve�mi odpor��an�)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Pros�m, vlo�te nepovinn� koment�r"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  pre zmenu n�zvu.\n"
-"C  pre zmenu koment�ra.\n"
-"E  pre zmenu e-mailovej adresy.\n"
-"O  pre pokra�ovanie generovania k���a.\n"
-"Q  pre ukon�enie generovania k���a."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Ak chcete generova� podk���, odpovedzte \"ano\" (alebo len \"a\")."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Sk�r ako podp��ete id u��vate�a, mali by ste najprv overi�, �i k���\n"
-"patr� osobe, ktorej meno je uveden� v identifik�tore u��vate�a.\n"
-"Je ve�mi u�ito�n�, ke� ostatn� vedia, ako d�sledne ste previedli\n"
-"tak�to overenie.\n"
-"\n"
-"\"0\" znamen�, �e neuv�dzate, ako d�sledne ste pravos� k���a overili\n"
-"\n"
-"\"1\" znamen�, �e ver�te tomu, �e k��� patr� osobe, ktor� je uveden�,\n"
-"    v u��vate�skom ID, ale nemohli ste alebo jste nepreverili t�to "
-"skuto�nos�.\n"
-"    To je u�ito�n� pre \"osobn�\" verifik�ciu, ke� podpisujete k���e, ktor�\n"
-"    pou��vaj� pseudonym u��vate�a.\n"
-"\n"
-"\"2\" znamen�, �e ste �iasto�ne overili pravos� k���a. Napr. ste overili\n"
-"    fingerprint k���a a skontrolovali identifik�tor u��vate�a\n"
-"    uveden� na k���i s fotografick�m id.\n"
-"\n"
-"\"3\" Znamen�, �e ste vykonali ve�mi d�kladn� overenie pravosti k���a.\n"
-"    To m��e napr�klad znamena�, �e ste overili fingerprint k���a \n"
-"    jeho vlastn�ka osobne a �alej ste pomocou ta�ko fal�ovate�n�ho \n"
-"    dokumentu s fotografiou (napr�klad pasu) overili, �e meno majite�a\n"
-"    k���a sa zhoduje s menom uveden�m v u��vate�skom ID a �alej ste \n"
-"    overili (v�menou elektronick�ch dopisov), �e elektronick� adresa "
-"uveden� \n"
-"    v ID u��vate�a patr� majite�ovi k���a.\n"
-"\n"
-"Pros�m nezab�dajte, �e pr�klady uveden� pre �rove� 2 a 3 s� *len*\n"
-"pr�klady.\n"
-"Je len na Va�om rozhodnut�, �o \"�iasto�n�\" a \"d�kladn�\" overenie "
-"znamen�\n"
-"ke� budete podpisova� k���e in�m u��vate�om.\n"
-"\n"
-"Pokia� neviete, ak� je spr�vna odpove�, odpovedzte \"0\"."
-
-#: g10/helptext.c:186
-#, fuzzy
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr ""
-"Pokia� chcete podp�sa� V�ETKY identifik�tory u��vate�ov, odpovedzte \"ano\""
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Pokia� skuto�ne chcete zmaza� tento identifik�tor u��vate�a, odpovedzte \"ano"
-"\".\n"
-"V�etky certifik�ty bud� tie� straten�!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Odpovedzte \"ano\", pokia� chcete zmaza� podk���"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Toto je platn� podpis k���a; norm�lne nechcete tento podpis zmaza�,\n"
-"preto�e m��e by� d�le�it� pri vytv�ran� d�very k���a alebo in�ho k���a\n"
-"ceritifikovan�ho t�mto k���om."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Tento podpis nem��e by� overen�, preto�e nem�te zodpovedaj�ci verejn� k���.\n"
-"Jeho zmazanie by ste mali odlo�i� do �asu, ke� budete vedie�, ktor� k���\n"
-"bol pou�it�, preto�e tento podpisovac� k��� m��e vytvori� d�veru\n"
-"prostredn�ctvom in�ho u� certifikovan�ho k���a."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "Podpis je neplatn�. Je rozumn� ho odstr�ni� z V�ho s�boru k���ov."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Toto je podpis, ktor� via�e identifik�tor u��vate�a ku k���u. Zvy�ajne\n"
-"nie je dobr� tak�to podpis odstr�ni�. GnuPG nem��e tento k��� na�alej\n"
-"pou��va�. Urobte to len v pr�pade, ke� je tento podpis k���a\n"
-"n�m sam�m z nejak�ho d�vodu neplatn� a ke� je k dispoz�cii in� k���."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Zmeni� predvo�by pre v�etky u��vate�sk� ID (alebo len pre ozna�en�)\n"
-"na aktu�lny zoznam predvolieb. �asov� raz�tka v�etk�ch dotknut�ch podpisov\n"
-"k���ov nimi samotn�mi bud� posunut� o jednu sekundu dopredu.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr ""
-"Pros�m, zopakujte posledn� heslo, aby ste si boli ist�, �o ste nap�sali."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Zadajte n�zov s�boru, ku ktor�mu sa podpis vz�ahuje"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Ak si prajete prep�sanie s�boru, odpovedzte \"ano\""
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Pros�m, vlo�te nov� n�zov s�boru. Ak len stla��te RETURN, bude\n"
-"pou�it� implicitn� s�bor (ktor� je zobrazen� v z�tvork�ch)."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Mali by ste �pecifikova� d�vod certifik�cie. V z�vislosti na kontexte\n"
-"m�te mo�nos� si vybra� zo zoznamu:\n"
-"  \"k��� bol kompromitovan�\"\n"
-"      Toto pou�ite, pokia� si mysl�te, �e k V�mu tajn�mu k���u z�skali\n"
-"       pr�stup neopr�vnen� osoby.\n"
-"  \"k��� je nahraden�\"\n"
-"      Toto pou�ite, pokia� ste tento k��� nahradili nov��m k���om.\n"
-"  \"k��� sa u� nepou��va\"\n"
-"      Toto pou�ite, pokia� tento k��� u� nepou��vate.\n"
-"  \"Identifik�tor u��vate�a u� nie je platn�\"\n"
-"      Toto pou�ite, pokia� by sa identifik�tor u��vate�a u� nemal pou��va�;\n"
-"      norm�lne sa pou��va na ozna�enie neplatnej e-mailov� adresy.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"Ak chcete, m��ete vlo�i� text popisuj�c� p�vod vzniku tohto revoka�n�ho\n"
-"ceritifik�tu. Pros�m, stru�ne. \n"
-"Text kon�� pr�zdnym riadkom.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Pomoc nie je k dispoz�cii"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc nie je dostupn� pre '%s'"
@@ -2942,13 +2765,13 @@ msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
@@ -3038,7 +2861,7 @@ msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
@@ -3529,8 +3352,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -3539,20 +3362,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 #, 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
@@ -3569,7 +3392,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
@@ -3935,93 +3758,93 @@ msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr "Not�cie: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4029,19 +3852,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:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4049,7 +3872,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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4058,75 +3881,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 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:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4135,196 +3958,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:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 #, 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:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 #, 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:3534
+#: g10/keyedit.c:3535
 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:3540
+#: g10/keyedit.c:3541
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 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:3687
+#: g10/keyedit.c:3688
 #, 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:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 #, 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:4147
+#: g10/keyedit.c:4148
 #, 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:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, 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:4507
+#: g10/keyedit.c:4508
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 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:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4368,12 +4191,12 @@ msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
@@ -4401,109 +4224,119 @@ msgstr "�ifrova� d�ta"
 msgid "Authenticate"
 msgstr ""
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, fuzzy, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ak� ve�kos� k���a si prajete? (1024) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4519,7 +4352,7 @@ msgstr ""
 "      <n>m = doba platnosti k���a skon�� za n mesiacov\n"
 "      <n>y = doba platnosti k���a skon�� za n rokov\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4535,40 +4368,40 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skon�� za n rokov\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4576,12 +4409,12 @@ msgstr ""
 "V� syst�m nevie zobrazi� d�tumy po roku 2038.\n"
 "V ka�dom pr�pade bud� d�tumy korektne spracov�van� do roku 2106.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 #, fuzzy
 msgid ""
 "\n"
@@ -4598,44 +4431,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4646,7 +4479,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 
@@ -4661,23 +4494,23 @@ msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4685,12 +4518,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4702,7 +4535,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4714,50 +4547,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, 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:3349
+#: g10/keygen.c:3363
 #, 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:3369
+#: g10/keygen.c:3383
 #, 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:3377
+#: g10/keygen.c:3391
 #, 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:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4766,12 +4599,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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4779,7 +4612,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:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4787,26 +4620,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:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, 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"
@@ -5111,198 +4944,198 @@ msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 msgid "public key is %s\n"
 msgstr "verejn� k��� je %08lX\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, 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:458
+#: g10/mainproc.c:464
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrovan� %s k���om, ID %08lX\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrovan� s %lu heslami\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrovan� jedn�m heslom\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "de�ifrovanie o.k.\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� meno s�boru='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 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:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, 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:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
@@ -5321,82 +5154,88 @@ msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr ""
+"vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+
+#: g10/misc.c:307
 #, fuzzy, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "�ifrovac� algoritmus nie je implementovan�"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, fuzzy, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, fuzzy, c-format
 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:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pre GnuPG nen�jden�\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = pros�m o viac inform�c�i\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
@@ -6173,29 +6012,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, 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:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
@@ -6526,7 +6365,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
@@ -6554,32 +6393,32 @@ msgstr "pros�m vykonajte --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
@@ -6720,12 +6559,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6786,11 +6625,11 @@ msgstr "nepodarilo posla� k��� na server: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6902,12 +6741,12 @@ msgstr "%s podpis, hashovac� algoritmus %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
@@ -6916,7 +6755,7 @@ msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "��tam mo�nosti z `%s'\n"
@@ -6979,22 +6818,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -7003,11 +6842,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -7048,8 +6887,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
@@ -7182,61 +7021,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "verifikova� podpis"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "duplicita predvo�by %c%lu\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "nespr�vny certifik�t"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7251,7 +7090,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7372,6 +7211,111 @@ msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (len na podpis)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (%d) RSA (len na �ifrovanie)\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) RSA (pro �ifrov�n� a podpis)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (len na podpis)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (len na �ifrovanie)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(�iadny popis)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "neplatn� hashovac� algoritmus `%s'\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "E-mailov� adresa: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Nap��te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Vlo�te nov� n�zov s�boru"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Ak chcete, nap��te popis; ukon�ite pr�zdnym riadkom:\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7405,201 +7349,201 @@ 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:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(�iadny popis)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeni� heslo"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr ""
 "pou�i� implicitn� k��� ako implicitn�ho\n"
 " adres�ta"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "v�bec nepou��va� termin�l"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "vyn�ti� podpisy verzie 3"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "na �ifrovanie v�dy pou�i� MDC"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "automaticky odpoveda� �no na v��inu ot�zok"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "prida� tento s�bor k���ov do zoznamu\n"
 " pou��van�ch s�borov k���ov"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "prida� tento s�bor tajn�ch k���ov do zoznamu"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 "|PO��TA�|pou�i tento server k���ov na vyh�ad�vanie\n"
 " k���ov"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|pou�i� kompresn� algoritmus N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7610,36 +7554,36 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7746,7 +7690,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7765,31 +7709,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "Dobr� podpis od \""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                alias \""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -8249,6 +8193,302 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Je na V�s, aby ste sem priradili hodnotu; t�to hodnota nebude nikdy\n"
+#~ "exportovan� tretej strane. Potrebujeme ju k implement�cii \"pavu�iny\n"
+#~ "d�very\"; nem� to ni� spolo�n� s (implicitne vytvorenou) \"pavu�inou\n"
+#~ "certifik�tov\"."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Aby bolo mo�n� vybudova� pavu�inu d�very, mus� GnuPG vedie�, ktor�m "
+#~ "k���om\n"
+#~ "d�verujete absol�tne - oby�ajne s� to tie k���e, pre ktor� m�te pr�stup\n"
+#~ "k tajn�m k���om. Odpovedzte \"ano\", aby ste nastavili tieto k���e\n"
+#~ "ako absol�tne d�veryhodn�\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Pokia� aj tak chcete pou�i� tento ned�veryhodn� k���, odpovedzte \"ano\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "Vlo�te identifik�tor adres�ta, ktor�mu chcete posla� spr�vu."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "V�ebecne nemo�no odpor��a� pou��va� rovnak� k��� na �ifrovanie a "
+#~ "podeisovanie\n"
+#~ "Tento algoritmus je vhodn� pou�i� len za ur�it�ch podmienok.\n"
+#~ "Kontaktujte pros�m najprv bezpe�nostn�ho �pecialistu."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Vlo�te d�ku k���a"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Odpovedzte \"ano\" alebo \"nie\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Vlo�te po�adovan� hodnotu tak, ako je uveden� v pr�kazovom riadku.\n"
+#~ "Je mo�n� vlo�i� d�tum vo form�te ISO (RRRR-MM-DD), ale nedostanete\n"
+#~ "spr�vnu chybov� hl�ku - miesto toho syst�m sk�si interpretova�\n"
+#~ "zadan� hodnotu ako interval."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Vlo�te meno dr�ite�a k���a"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "pros�m, vlo�te e-mailov� adresu (nepovinn�, ale ve�mi odpor��an�)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Pros�m, vlo�te nepovinn� koment�r"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  pre zmenu n�zvu.\n"
+#~ "C  pre zmenu koment�ra.\n"
+#~ "E  pre zmenu e-mailovej adresy.\n"
+#~ "O  pre pokra�ovanie generovania k���a.\n"
+#~ "Q  pre ukon�enie generovania k���a."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Ak chcete generova� podk���, odpovedzte \"ano\" (alebo len \"a\")."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Sk�r ako podp��ete id u��vate�a, mali by ste najprv overi�, �i k���\n"
+#~ "patr� osobe, ktorej meno je uveden� v identifik�tore u��vate�a.\n"
+#~ "Je ve�mi u�ito�n�, ke� ostatn� vedia, ako d�sledne ste previedli\n"
+#~ "tak�to overenie.\n"
+#~ "\n"
+#~ "\"0\" znamen�, �e neuv�dzate, ako d�sledne ste pravos� k���a overili\n"
+#~ "\n"
+#~ "\"1\" znamen�, �e ver�te tomu, �e k��� patr� osobe, ktor� je uveden�,\n"
+#~ "    v u��vate�skom ID, ale nemohli ste alebo jste nepreverili t�to "
+#~ "skuto�nos�.\n"
+#~ "    To je u�ito�n� pre \"osobn�\" verifik�ciu, ke� podpisujete k���e, "
+#~ "ktor�\n"
+#~ "    pou��vaj� pseudonym u��vate�a.\n"
+#~ "\n"
+#~ "\"2\" znamen�, �e ste �iasto�ne overili pravos� k���a. Napr. ste overili\n"
+#~ "    fingerprint k���a a skontrolovali identifik�tor u��vate�a\n"
+#~ "    uveden� na k���i s fotografick�m id.\n"
+#~ "\n"
+#~ "\"3\" Znamen�, �e ste vykonali ve�mi d�kladn� overenie pravosti k���a.\n"
+#~ "    To m��e napr�klad znamena�, �e ste overili fingerprint k���a \n"
+#~ "    jeho vlastn�ka osobne a �alej ste pomocou ta�ko fal�ovate�n�ho \n"
+#~ "    dokumentu s fotografiou (napr�klad pasu) overili, �e meno majite�a\n"
+#~ "    k���a sa zhoduje s menom uveden�m v u��vate�skom ID a �alej ste \n"
+#~ "    overili (v�menou elektronick�ch dopisov), �e elektronick� adresa "
+#~ "uveden� \n"
+#~ "    v ID u��vate�a patr� majite�ovi k���a.\n"
+#~ "\n"
+#~ "Pros�m nezab�dajte, �e pr�klady uveden� pre �rove� 2 a 3 s� *len*\n"
+#~ "pr�klady.\n"
+#~ "Je len na Va�om rozhodnut�, �o \"�iasto�n�\" a \"d�kladn�\" overenie "
+#~ "znamen�\n"
+#~ "ke� budete podpisova� k���e in�m u��vate�om.\n"
+#~ "\n"
+#~ "Pokia� neviete, ak� je spr�vna odpove�, odpovedzte \"0\"."
+
+#, fuzzy
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr ""
+#~ "Pokia� chcete podp�sa� V�ETKY identifik�tory u��vate�ov, odpovedzte \"ano"
+#~ "\""
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Pokia� skuto�ne chcete zmaza� tento identifik�tor u��vate�a, odpovedzte "
+#~ "\"ano\".\n"
+#~ "V�etky certifik�ty bud� tie� straten�!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Odpovedzte \"ano\", pokia� chcete zmaza� podk���"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Toto je platn� podpis k���a; norm�lne nechcete tento podpis zmaza�,\n"
+#~ "preto�e m��e by� d�le�it� pri vytv�ran� d�very k���a alebo in�ho k���a\n"
+#~ "ceritifikovan�ho t�mto k���om."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Tento podpis nem��e by� overen�, preto�e nem�te zodpovedaj�ci verejn� "
+#~ "k���.\n"
+#~ "Jeho zmazanie by ste mali odlo�i� do �asu, ke� budete vedie�, ktor� k���\n"
+#~ "bol pou�it�, preto�e tento podpisovac� k��� m��e vytvori� d�veru\n"
+#~ "prostredn�ctvom in�ho u� certifikovan�ho k���a."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr "Podpis je neplatn�. Je rozumn� ho odstr�ni� z V�ho s�boru k���ov."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Toto je podpis, ktor� via�e identifik�tor u��vate�a ku k���u. Zvy�ajne\n"
+#~ "nie je dobr� tak�to podpis odstr�ni�. GnuPG nem��e tento k��� na�alej\n"
+#~ "pou��va�. Urobte to len v pr�pade, ke� je tento podpis k���a\n"
+#~ "n�m sam�m z nejak�ho d�vodu neplatn� a ke� je k dispoz�cii in� k���."
+
+#~ 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 ""
+#~ "Zmeni� predvo�by pre v�etky u��vate�sk� ID (alebo len pre ozna�en�)\n"
+#~ "na aktu�lny zoznam predvolieb. �asov� raz�tka v�etk�ch dotknut�ch "
+#~ "podpisov\n"
+#~ "k���ov nimi samotn�mi bud� posunut� o jednu sekundu dopredu.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr ""
+#~ "Pros�m, zopakujte posledn� heslo, aby ste si boli ist�, �o ste nap�sali."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Zadajte n�zov s�boru, ku ktor�mu sa podpis vz�ahuje"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Ak si prajete prep�sanie s�boru, odpovedzte \"ano\""
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Pros�m, vlo�te nov� n�zov s�boru. Ak len stla��te RETURN, bude\n"
+#~ "pou�it� implicitn� s�bor (ktor� je zobrazen� v z�tvork�ch)."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Mali by ste �pecifikova� d�vod certifik�cie. V z�vislosti na kontexte\n"
+#~ "m�te mo�nos� si vybra� zo zoznamu:\n"
+#~ "  \"k��� bol kompromitovan�\"\n"
+#~ "      Toto pou�ite, pokia� si mysl�te, �e k V�mu tajn�mu k���u z�skali\n"
+#~ "       pr�stup neopr�vnen� osoby.\n"
+#~ "  \"k��� je nahraden�\"\n"
+#~ "      Toto pou�ite, pokia� ste tento k��� nahradili nov��m k���om.\n"
+#~ "  \"k��� sa u� nepou��va\"\n"
+#~ "      Toto pou�ite, pokia� tento k��� u� nepou��vate.\n"
+#~ "  \"Identifik�tor u��vate�a u� nie je platn�\"\n"
+#~ "      Toto pou�ite, pokia� by sa identifik�tor u��vate�a u� nemal "
+#~ "pou��va�;\n"
+#~ "      norm�lne sa pou��va na ozna�enie neplatnej e-mailov� adresy.\n"
+
+#~ 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 ""
+#~ "Ak chcete, m��ete vlo�i� text popisuj�c� p�vod vzniku tohto revoka�n�ho\n"
+#~ "ceritifik�tu. Pros�m, stru�ne. \n"
+#~ "Text kon�� pr�zdnym riadkom.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov\n"
 
@@ -8401,9 +8641,6 @@ msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 #~ msgid "unknown packet type"
 #~ msgstr "nezn�my typ paketu"
 
-#~ msgid "unknown version"
-#~ msgstr "nezn�ma verzia"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "nezn�my algoritmus verejn�ho k���a"
 
@@ -8518,9 +8755,6 @@ msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 #~ msgid "network error"
 #~ msgstr "chyba siete"
 
-#~ msgid "not encrypted"
-#~ msgstr "neza�ifrovan�"
-
 #~ msgid "not processed"
 #~ msgstr "nespracovan�"
 
@@ -8867,9 +9101,6 @@ msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 #~ msgid "%08lX: We do NOT trust this key\n"
 #~ msgstr "%08lX: NEd�verujeme tomuto k���u!\n"
 
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (pro �ifrov�n� a podpis)\n"
-
 #, fuzzy
 #~ msgid "   (%d) RSA (auth only)\n"
 #~ msgstr "   (%d) RSA (len na podpis)\n"
diff --git a/po/sv.po b/po/sv.po
index f35f0019b..2d4b49eb0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+0100\n"
 "PO-Revision-Date: 2007-11-12 16:08+0100\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -60,47 +60,47 @@ msgstr ""
 msgid "Quality:"
 msgstr "giltighet: %s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 msgid "Passphrase"
 msgstr "Lösenfras"
 
@@ -111,21 +111,21 @@ msgstr "Lösenfras"
 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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -206,8 +206,8 @@ msgstr "PIN-kod repeterades inte korrekt; försök igen"
 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "fel när temporärfil skapades: %s\n"
@@ -295,7 +295,7 @@ 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:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -312,13 +312,13 @@ msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "utförlig"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
@@ -396,8 +396,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv miljöinställningar även till FIL"
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
@@ -413,29 +413,30 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
@@ -545,12 +546,12 @@ msgstr "%s %s stoppad\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -623,7 +624,7 @@ msgstr "avbruten\n"
 msgid "error opening `%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fil \"%s\", rad %d: %s\n"
@@ -648,7 +649,7 @@ msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fel vid läsning av \"%s\", rad %d: %s\n"
@@ -878,6 +879,147 @@ msgstr "slut på kärna i säkert minne vid allokering av %lu byte"
 msgid "out of core while allocating %lu bytes"
 msgstr "slut på kärna vid allokering av %lu byte"
 
+#: common/asshelp.c:242
+#, fuzzy
+msgid "no running gpg-agent - starting one\n"
+msgstr "ingen körande dirmngr - startar \"%s\"\n"
+
+#: common/asshelp.c:347
+#, fuzzy
+msgid "can't connect to the agent - trying fall back\n"
+msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "certifikatkedjan är för lång\n"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "rotcertifikatet är korrekt\n"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "lista allt tillgängligt data"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: nyckelring skapad\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "giltighet: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Algoritmer som stöds:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "(det här verkar inte vara ett krypterat meddelande)\n"
+
+#: common/audit.c:740
+#, fuzzy
+msgid "Number of recipients"
+msgstr "Nuvarande mottagare:\n"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "signaturvalidering utlämnad\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "Signatur gjord "
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "ingen signatur hittades\n"
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Signatur gjord "
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "certifikatet är ännu inte giltigt"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "rotcertifikatet är korrekt\n"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "ingen spärrlista hittades för certifikatet"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "exportera certifikat"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "okänd flagga \"%s\"\n"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "fel i avslutande rad\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1001,13 +1143,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i satsläge\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
@@ -1174,7 +1316,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
@@ -1281,18 +1423,18 @@ msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1332,7 +1474,7 @@ msgstr "det finns en hemlig nyckel för denna publika nyckeln \"%s\"!\n"
 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:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel när lösenfras skapades: %s\n"
@@ -1351,7 +1493,7 @@ msgstr "använder %s-chiffer\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" är redan komprimerad\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
@@ -1380,7 +1522,7 @@ msgstr ""
 "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1410,20 +1552,20 @@ msgstr "%s/%s krypterad för: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "%s-krypterad data\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, 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:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel\n"
 "i det symmetriska chiffret.\n"
 
-#: g10/encr-data.c:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "problem vid hanteringen av krypterat paket\n"
 
@@ -1566,7 +1708,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
@@ -1581,7 +1723,7 @@ msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1597,28 +1739,28 @@ msgstr "|[fil]|skapa en signatur"
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartextsignatur"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering endast med symmetriskt chiffer"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "lista nycklar"
 
@@ -1630,11 +1772,11 @@ msgstr "lista nycklar och signaturer"
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
@@ -1670,11 +1812,11 @@ msgstr "generera ett spärrcertifikat"
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
@@ -1710,12 +1852,12 @@ msgstr "uppdatera tillitsdatabasen"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 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:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1726,32 +1868,32 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 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:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
@@ -1769,7 +1911,7 @@ msgstr "generera PGP 2.x-kompatibla meddelanden"
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1777,7 +1919,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1818,7 +1960,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1838,11 +1980,11 @@ msgstr "Chiffer: "
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr "Använda bibliotek:"
 
@@ -1850,7 +1992,7 @@ msgstr "Använda bibliotek:"
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
@@ -1931,464 +2073,464 @@ msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, 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:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, 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:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, 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:2782
+#: g10/gpg.c:2821
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 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:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, 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:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 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:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 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:3040
+#: g10/gpg.c:3088
 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:3042
+#: g10/gpg.c:3090
 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:3044
+#: g10/gpg.c:3092
 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:3046
+#: g10/gpg.c:3094
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3048
+#: g10/gpg.c:3096
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 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:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3217
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 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:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 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:3381
+#: g10/gpg.c:3429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -2403,7 +2545,7 @@ msgstr "ta nycklarna från denna nyckelring "
 msgid "make timestamp conflicts only a warning"
 msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
@@ -2419,353 +2561,11 @@ msgstr ""
 "Syntax: gpg [flaggor] [filer]\n"
 "Kontrollera signaturerna mot kända nycklar\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Det är upp till dig att ange ett värde här. Detta värde kommer aldrig att\n"
-"exporteras till någon tredje part. Vi behöver det för att implementera\n"
-"\"Web of trust\". Det har inget att göra med det (implicit skapade)\n"
-"nätet av certifikat."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"För att kunna bygga förtroendeväven \"Web-of-Trust\",\n"
-"måste GnuPG veta vilka nycklar som du litar förbehållslöst på\n"
-"- 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:62
-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:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-"Ange användaridentiteten för den adressat du vill skicka meddelandet till."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"Välj vilken algoritm som ska användas.\n"
-"\n"
-"DSA (även känd som DSS) är Digital Signature Algorithm och kan endast\n"
-"användas för signaturer.\n"
-"\n"
-"Elgamal är en algoritm som endast kan användas för kryptering.\n"
-"\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."
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"Som regel är det ingen bra idé att använda samma nyckel för signering\n"
-"och kryptering. Denna algoritm ska endast användas inom särskilda\n"
-"områden. Rådgör med din egen säkerhetsexpert först!"
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Ange storleken på nyckeln"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Svara \"ja\" eller \"nej\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"Ange värdet som krävs som det visas vid prompten.\n"
-"Det är möjligt att ange ett ISO-datum (ÅÅÅÅ-MM-DD) men du kommer\n"
-"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:117
-msgid "Enter the name of the key holder"
-msgstr "Ange namnet på nyckelns ägare"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Ange en kommentar (frivilligt)"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  för att ändra namnet.\n"
-"C  för att ändra kommentaren.\n"
-"E  för att ändra e-postadressen.\n"
-"O  för att fortsätta med nyckelgenerering.\n"
-"Q  för att avsluta nyckelgenereringen."
-
-#: g10/helptext.c:140
-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:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"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"
-"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"
-"\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"
-"    mot en fotolegitimation.\n"
-"\n"
-"\"3\" betyder att du gjorde en noggrann och uttömmande kontroll av nyckeln.  "
-"Detta kan\n"
-"    t.ex. 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\n"
-"    (genom att utväxla e-postmeddelanden) att e-postadressen på nyckeln "
-"tillhör\n"
-"    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"
-"betyder när du signerar andras nycklar.\n"
-"\n"
-"Om du inte vet vad du ska svara, så svara \"0\"."
-
-# felstavat original meddelat till Werner.
-#: g10/helptext.c:186
-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:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Svara \"ja\" om du verkligen vill ta bort denna användaridentitet.\n"
-"Alla certifikat kommer att gå förlorade!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Svara \"ja\" om du vill ta bort denna undernyckel"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Detta är en giltig signatur på nyckeln. Normalt sett vill du inte\n"
-"ta bort denna signatur eftersom den kan vara viktig för att skapa\n"
-"en tillitskoppling till nyckeln eller en annan nyckel som är\n"
-"certifierad av denna nyckel."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Denna signatur kan inte valideras eftersom du inte har den\n"
-"motsvarande nyckeln. Du bör vänta med att ta bort den tills du\n"
-"vet vilken nyckel som användes eftersom den nyckeln kanske upprättar\n"
-"en tillitskoppling genom en annan redan certifierad nyckel."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr ""
-"Denna signatur är inte giltig. Det är rimligt att ta bort den från\n"
-"din nyckelring."
-
-# borde inge GnuPG bytas ut mot gpg eller ännu bättre %s?
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Detta är en signatur som knyter användaridentiteten till denna nyckel.\n"
-"Det är oftast inte en bra idé att ta bort en sådan signatur. Till\n"
-"och med kan det bli så att GnuPG kanske inte kan använda denna nyckel\n"
-"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:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Ändra dina inställningar för alla användaridentiteter (eller enbart 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:230
-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:236
-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:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "Ange namnet på den fil signaturen gäller"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Svara \"ja\" om du vill skriva över filen"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Ange ett nytt filnamn. Om du bara trycker RETUR kommer standarfilnamnet\n"
-"(som anges i hakparenteser) att användas."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"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 blivit komprometterad\"\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"
-"  \"Nyckeln används inte längre\"\n"
-"     Använd denna om du har pensionerat denna nyckel.\n"
-"  \"Användaridentiteten är inte längre giltig\"\n"
-"     Använd denna för att visa att denna användaridentitet inte längre\n"
-"     skall användas. Detta används normalt för att visa att en e-postadress\n"
-"     är ogiltig.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"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"
-"En tom rad avslutar texten.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "Det finns ingen hjälp tillgänglig"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
@@ -2964,13 +2764,13 @@ msgstr "nyckel %s: ny nyckel - hoppade över\n"
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
@@ -3060,7 +2860,7 @@ msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemliga nycklar tillåts inte\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
@@ -3522,8 +3322,8 @@ msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
@@ -3534,19 +3334,19 @@ msgstr ""
 "Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
 "att ändra.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 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:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
@@ -3563,7 +3363,7 @@ msgstr ""
 "Skriv in den nya lösenfrasen för den hemliga nyckeln.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenfrasen repeterades inte korrekt; försök igen."
 
@@ -3906,93 +3706,93 @@ msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 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:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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"
 
-#: g10/keyedit.c:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4000,17 +3800,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "spärrad"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "utgånget"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -4019,7 +3819,7 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4028,75 +3828,75 @@ msgstr ""
 "VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan\n"
 "         vissa versioner av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 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:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 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:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentitet \"%s\": redan minimerad\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4106,195 +3906,195 @@ msgstr ""
 "denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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"
 
-#: g10/keyedit.c:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 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:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som mest en undernyckel.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 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:3687
+#: g10/keyedit.c:3688
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, 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 korscertifieras\n"
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 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:4146
+#: g10/keyedit.c:4147
 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:4147
+#: g10/keyedit.c:4148
 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:4209
+#: g10/keyedit.c:4210
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 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:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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"
 
-#: g10/keyedit.c:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, 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"
@@ -4334,12 +4134,12 @@ msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
@@ -4371,110 +4171,120 @@ msgstr "Autentisera"
 # K = Kryptera
 # A = Authentisera
 # Q = Avsluta
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "Möjliga åtgärder för en %s-nyckel: "
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "För närvarande tillåtna åtgärder: "
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Växla signeringsförmågan\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Växla krypteringsförmågan\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Växla autentiseringsförmågan\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Färdig\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA och Elgamal (standard)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, 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:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (endast kryptering)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, 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:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA-nyckelparet kommer att ha %u bitar.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, 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:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, 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:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, 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:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4491,7 +4301,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:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4507,38 +4317,38 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4546,11 +4356,11 @@ 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:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4568,44 +4378,44 @@ msgstr ""
 "    \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckentabellen \"%s\"\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4616,7 +4426,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 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"
 
@@ -4632,24 +4442,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 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:2044
+#: g10/keygen.c:2058
 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:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4657,12 +4467,12 @@ msgstr ""
 "Du behöver en lösenfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4674,7 +4484,7 @@ msgstr ""
 "om du använder detta program med flaggan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4686,51 +4496,51 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den publika nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemliga nyckelstumpen till \"%s\"\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbar hemlig nyckelring hittades: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 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:3415
+#: g10/keygen.c:3429
 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"
@@ -4739,13 +4549,13 @@ msgstr ""
 "vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta "
 "syfte.\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4753,7 +4563,7 @@ msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4761,25 +4571,25 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
@@ -5079,200 +4889,200 @@ 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:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, 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:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenfras\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-chiffer är inte tillgängligt. Försöker optimistiskt att använda %s "
 "istället\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 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:565
+#: g10/mainproc.c:571
 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:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VARNING: multipla klartexter har påträffats\n"
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 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:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
 
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, 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:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 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:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ogiltigt rotpaket hittades i proc_tree()\n"
 
@@ -5291,80 +5101,85 @@ msgstr "fstat(%d) misslyckades i %s: %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "VARNING: använder experimentella algoritmen %s för publik nyckel\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "VARNING: använder experimentella chifferalgoritmen %s\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "insticksmodul för IDEA-chiffer är inte installerat\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se %s för mer information\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, 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:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "okänd flagga \"%s\"\n"
@@ -6149,13 +5964,13 @@ msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signatur från: \"%s\"\n"
 
-#: g10/sign.c:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6163,17 +5978,17 @@ msgstr ""
 "VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
@@ -6508,7 +6323,7 @@ msgstr "förbehållslös"
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
@@ -6540,33 +6355,33 @@ msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, 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:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marginal(er) behövs, %d fullständig(a) behövs, tillitsmodell %s\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, 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"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6700,12 +6515,12 @@ msgstr ""
 "Syntax: kbxutil [flaggor] [filer]\n"
 "lista, exportera, importera nyckelskåpsdata\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "||Knappa in din PIN-kod på läsarens knappsats"
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-återanrop returnerade fel: %s\n"
@@ -6766,11 +6581,11 @@ msgstr "validering av CHV%d misslyckades: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "fel vid hämtning av CHV-status från kort\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "kortet är låst permanent!\n"
 
@@ -6877,14 +6692,14 @@ msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 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:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@ -6893,7 +6708,7 @@ msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 msgid "read options from file"
 msgstr "läs inställningar från fil"
 
@@ -6953,21 +6768,21 @@ msgstr "hanterare för fd %d avslutad\n"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "ingen körande dirmngr - startar \"%s\"\n"
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "miljövariabeln DIRMNGR_INFO är felformaterad\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "dirmngr-protokoll version %d stöds inte\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
 
@@ -6976,11 +6791,11 @@ msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
 msgid "validation model requested by certificate: %s"
 msgstr "valideringsmodellen begärd av certifikat: %s"
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr "kedja"
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 msgid "shell"
 msgstr "skal"
 
@@ -7019,8 +6834,8 @@ msgstr "slår upp utfärdare på extern plats\n"
 msgid "number of issuers matching: %d\n"
 msgstr "antal utfärdare som matchar: %d\n"
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
@@ -7141,57 +6956,57 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr "självsignerat certifikat har en FELAKTIG signatur"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr "rotcertifikatet har inte markerats som betrott"
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "certifikatkedjan är för lång\n"
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 msgid "certificate has a BAD signature"
 msgstr "certifikatet har en FELAKTIG signatur"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 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:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certifikatkedjan längre än vad som tillåts av CA (%d)"
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 msgid "certificate is good\n"
 msgstr "certifikatet är korrekt\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 msgid "intermediate certificate is good\n"
 msgstr "tillfälligt certifikat är korrekt\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 msgid "root certificate is good\n"
 msgstr "rotcertifikatet är korrekt\n"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr "växlar till kedjemodell"
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr "valideringsmodell använd: %s"
@@ -7206,7 +7021,7 @@ msgstr "%s-nyckeln använder en osäker hash (%u bitar)\n"
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(det här är MD2-algoritmen)\n"
 
@@ -7325,6 +7140,111 @@ msgstr "rad %d: fel vid hämtning av nyckelhashen \"%s\": %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "rad %d: nyckelgenerering misslyckades: %s <%s>\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (endast signering)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (2) Krypteringsnyckel\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, fuzzy, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "Möjliga åtgärder för en %s-nyckel: "
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) DSA (endast signering)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (endast signering)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (endast kryptering)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "rad %d: inget ämnesnamn angivit\n"
+
+#: sm/certreqgen-ui.c:211
+#, fuzzy, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr "rad %d: ogiltig ämnesnamnsetikett \"%.*s\"\n"
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "rad %d: ogiltig ämnesnamnsetikett \"%.*s\"\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "E-postadress: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Ange användaridentiteten.  Avsluta med en tom rad: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Ange nytt filnamn"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(det här är RC2-algoritmen)\n"
@@ -7358,186 +7278,186 @@ msgstr "certifikatet \"%s\" togs bort\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 msgid "|[FILE]|make a signature"
 msgstr "|[FIL]|skapa en signatur"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[FIL]|skapa en klartext-signatur"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 msgid "list external keys"
 msgstr "lista externa nycklar"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 msgid "list certificate chain"
 msgstr "lista certifikatkedja"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 msgid "remove key from the public keyring"
 msgstr "ta bort nyckel från den publika nyckelringen"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 msgid "import certificates"
 msgstr "importera certifikat"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 msgid "export certificates"
 msgstr "exportera certifikat"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr "registrera ett smartkort"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 msgid "create base-64 encoded output"
 msgstr "skapa base-64-kodat utdata"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr "anta att inmatning är i PEM-format"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr "anta att inmatning är i base-64-format"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr "anta att inmatning är i binärformat"
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr "använd systemets dirmngr om tillgängligt"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikat att inkludera"
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr "hämta saknade utfärdarcertifikat"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som standardmottagare"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 #, fuzzy
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "tvinga v3-signaturer"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "anta ja på de flesta frågorna"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan över nyckelringar"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 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:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|ställ in terminalteckentabell till NAMN"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|läs in tilläggsmodulen FIL"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd sammandragsalgoritmen NAMN"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 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:576
+#: sm/gpgsm.c:578
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7547,35 +7467,35 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 msgid "usage: gpgsm [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "OBSERVERA: kommer inte att kunna kryptera till \"%s\": %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "okänd valideringsmodell \"%s\"\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr "det här kommandot har ännu inte implementerats\n"
 
@@ -7686,7 +7606,7 @@ msgstr ""
 "\n"
 "%s%sÄr du säker på att du vill göra det här?"
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7711,28 +7631,28 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 msgid "Signature made "
 msgstr "Signatur gjord "
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr "[datum inte angivet]"
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr " använder certifikat-id 0x%08lX\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 msgid "Good signature from"
 msgstr "Korrekt signatur från"
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 msgid "                aka"
 msgstr "      även känd som"
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 msgid "This is a qualified signature\n"
 msgstr "Det här är en kvalificerad signatur\n"
 
@@ -8177,3 +8097,336 @@ msgstr "ingen klass tillhandahölls\n"
 #, c-format
 msgid "class %s is not supported\n"
 msgstr "klassen %s stöds inte\n"
+
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Användning: gpg-connect-agent [flaggor] (-h för hjälp)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Det är upp till dig att ange ett värde här. Detta värde kommer aldrig "
+#~ "att\n"
+#~ "exporteras till någon tredje part. Vi behöver det för att implementera\n"
+#~ "\"Web of trust\". Det har inget att göra med det (implicit skapade)\n"
+#~ "nätet av certifikat."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "För att kunna bygga förtroendeväven \"Web-of-Trust\",\n"
+#~ "måste GnuPG veta vilka nycklar som du litar förbehållslöst på\n"
+#~ "- 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"
+
+#~ 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\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr ""
+#~ "Ange användaridentiteten för den adressat du vill skicka meddelandet till."
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "Välj vilken algoritm som ska användas.\n"
+#~ "\n"
+#~ "DSA (även känd som DSS) är Digital Signature Algorithm och kan endast\n"
+#~ "användas för signaturer.\n"
+#~ "\n"
+#~ "Elgamal är en algoritm som endast kan användas för kryptering.\n"
+#~ "\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."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "Som regel är det ingen bra idé att använda samma nyckel för signering\n"
+#~ "och kryptering. Denna algoritm ska endast användas inom särskilda\n"
+#~ "områden. Rådgör med din egen säkerhetsexpert först!"
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Ange storleken på nyckeln"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Svara \"ja\" eller \"nej\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "Ange värdet som krävs som det visas vid prompten.\n"
+#~ "Det är möjligt att ange ett ISO-datum (ÅÅÅÅ-MM-DD) men du kommer\n"
+#~ "inte att få något vettigt felmeddelande - istället kommer systemet\n"
+#~ "att försöka tolka det angivna värdet som ett intervall."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Ange namnet på nyckelns ägare"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Ange en kommentar (frivilligt)"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  för att ändra namnet.\n"
+#~ "C  för att ändra kommentaren.\n"
+#~ "E  för att ändra e-postadressen.\n"
+#~ "O  för att fortsätta med nyckelgenerering.\n"
+#~ "Q  för att avsluta nyckelgenereringen."
+
+#~ 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."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "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"
+#~ "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"
+#~ "\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"
+#~ "    mot en fotolegitimation.\n"
+#~ "\n"
+#~ "\"3\" betyder att du gjorde en noggrann och uttömmande kontroll av "
+#~ "nyckeln.  Detta kan\n"
+#~ "    t.ex. 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\n"
+#~ "    (genom att utväxla e-postmeddelanden) att e-postadressen på nyckeln "
+#~ "tillhör\n"
+#~ "    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"
+#~ "betyder när du signerar andras nycklar.\n"
+#~ "\n"
+#~ "Om du inte vet vad du ska svara, så svara \"0\"."
+
+# felstavat original meddelat till Werner.
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "Svara \"ja\" om du vill signera ALLA användaridentiteter"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Svara \"ja\" om du verkligen vill ta bort denna användaridentitet.\n"
+#~ "Alla certifikat kommer att gå förlorade!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Svara \"ja\" om du vill ta bort denna undernyckel"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Detta är en giltig signatur på nyckeln. Normalt sett vill du inte\n"
+#~ "ta bort denna signatur eftersom den kan vara viktig för att skapa\n"
+#~ "en tillitskoppling till nyckeln eller en annan nyckel som är\n"
+#~ "certifierad av denna nyckel."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Denna signatur kan inte valideras eftersom du inte har den\n"
+#~ "motsvarande nyckeln. Du bör vänta med att ta bort den tills du\n"
+#~ "vet vilken nyckel som användes eftersom den nyckeln kanske upprättar\n"
+#~ "en tillitskoppling genom en annan redan certifierad nyckel."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr ""
+#~ "Denna signatur är inte giltig. Det är rimligt att ta bort den från\n"
+#~ "din nyckelring."
+
+# borde inge GnuPG bytas ut mot gpg eller ännu bättre %s?
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Detta är en signatur som knyter användaridentiteten till denna nyckel.\n"
+#~ "Det är oftast inte en bra idé att ta bort en sådan signatur. Till\n"
+#~ "och med kan det bli så att GnuPG kanske inte kan använda denna nyckel\n"
+#~ "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."
+
+#~ 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 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"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Ange en lösenfras. Detta är en hemlig mening\n"
+
+#~ 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
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "Ange namnet på den fil signaturen gäller"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Svara \"ja\" om du vill skriva över filen"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Ange ett nytt filnamn. Om du bara trycker RETUR kommer standarfilnamnet\n"
+#~ "(som anges i hakparenteser) att användas."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "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 blivit komprometterad\"\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"
+#~ "  \"Nyckeln används inte längre\"\n"
+#~ "     Använd denna om du har pensionerat denna nyckel.\n"
+#~ "  \"Användaridentiteten är inte längre giltig\"\n"
+#~ "     Använd denna för att visa att denna användaridentitet inte längre\n"
+#~ "     skall användas. Detta används normalt för att visa att en e-"
+#~ "postadress\n"
+#~ "     är ogiltig.\n"
+
+#~ 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"
+#~ "En tom rad avslutar texten.\n"
diff --git a/po/tr.po b/po/tr.po
index 1605acdd9..f1546d0f5 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -43,46 +43,46 @@ msgstr ""
 msgid "Quality:"
 msgstr "geçerliliği: %s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 msgid "Passphrase"
 msgstr "Anahtar Parolası"
 
@@ -91,21 +91,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:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -186,8 +186,8 @@ 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:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "geçici dosya oluşturulurken hata: %s\n"
@@ -263,7 +263,7 @@ msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -280,13 +280,13 @@ msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ayrıntılı"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
@@ -363,8 +363,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Yazılım hatalarını lütfen <"
 
@@ -380,29 +380,30 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, fuzzy, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "libksba çok eski (gereken %s, sizinki %s)\n"
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, 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:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
@@ -513,12 +514,12 @@ msgstr "%s %s durdu\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -592,7 +593,7 @@ msgstr "iptal edildi\n"
 msgid "error opening `%s': %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "`%s' dosyası, %d. satır: %s\n"
@@ -617,7 +618,7 @@ msgstr "`%s', %d. satırda parmakizi hatalı\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "`%s' okunurken %d. satırda hata: %s\n"
@@ -842,6 +843,145 @@ msgstr "%lu bayt ayrılırken güvenli bellekte nüve dışına çıkıldı"
 msgid "out of core while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr "çalışan gpg-agent yok - bir tane başlatılıyor\n"
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr "aracıya bağlanılamıyor - son çareye başvuruluyor\n"
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "sertifika zinciri çok uzun\n"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "kök sertifika güvenilir olarak imli değil"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "tüm kullanılabilir veriyi listeler"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: anahtarlık oluşturuldu\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "geçerliliği: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"Desteklenen algoritmalar:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "(bu bir şifreli iletiymiş gibi görünmüyor)\n"
+
+#: common/audit.c:740
+#, fuzzy
+msgid "Number of recipients"
+msgstr "Şimdiki alıcılar:\n"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "imza doğrulama engellendi\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "İmza "
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "hiç imza yok\n"
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "`%s' çittirim algoritması geçersiz\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "İmza "
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "sertifika henüz geçersiz"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "kök sertifika güvenilir olarak imli değil"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "sertifika için bir CRL yok"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "sertifikaları ihraç eder"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "`%s' seçeneği bilinmiyor\n"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "\"%s\" için yardım mevcut değil"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "kuyruk satırında hata\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -961,13 +1101,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
@@ -1134,7 +1274,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
@@ -1238,18 +1378,18 @@ msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1289,7 +1429,7 @@ msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@ -1308,7 +1448,7 @@ msgstr "%s şifrelemesi kullanılıyor\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
@@ -1337,7 +1477,7 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1367,17 +1507,17 @@ msgstr "%s/%s \"%s\" için şifrelendi\n"
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 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:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "şifreli paketin elde edilmesinde sorun var\n"
 
@@ -1521,7 +1661,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -1537,7 +1677,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:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1553,27 +1693,27 @@ msgstr "|[dosya]|bir imza yapar"
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "anahtarları listeler"
 
@@ -1585,11 +1725,11 @@ msgstr "anahtarları ve imzaları listeler"
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
@@ -1625,11 +1765,11 @@ msgstr "bir yürürlükten kaldırma sertifikası üretir"
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
@@ -1665,11 +1805,11 @@ msgstr "güvence veritabanını günceller"
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1680,32 +1820,32 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 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:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 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:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
@@ -1721,7 +1861,7 @@ msgstr "kesin OpenPGP davranışı etkin olur"
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1729,7 +1869,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1769,7 +1909,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1789,11 +1929,11 @@ msgstr "Şifre: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1801,7 +1941,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
@@ -1872,461 +2012,461 @@ msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensi
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 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:1603
+#: g10/gpg.c:1639
 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:1605
+#: g10/gpg.c:1641
 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:1607
+#: g10/gpg.c:1643
 msgid "show the keyring name in key listings"
 msgstr "anahtar listelerinde anahtarlık ismini gösterir"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, 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:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, 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:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, 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:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 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:2582
+#: g10/gpg.c:2621
 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:2584
+#: g10/gpg.c:2623
 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:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 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:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, 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:2782
+#: g10/gpg.c:2821
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, 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:2916
+#: g10/gpg.c:2964
 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:2922
+#: g10/gpg.c:2970
 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:2928
+#: g10/gpg.c:2976
 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:2941
+#: g10/gpg.c:2989
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 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:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 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:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 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:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, 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:3164
+#: g10/gpg.c:3212
 #, 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:3169
+#: g10/gpg.c:3217
 #, 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:3261
+#: g10/gpg.c:3309
 #, 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:3272
+#: g10/gpg.c:3320
 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:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, 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:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 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:3330
+#: g10/gpg.c:3378
 #, 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:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 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:3381
+#: g10/gpg.c:3429
 #, 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:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, 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:3555
+#: g10/gpg.c:3603
 #, 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:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -2338,7 +2478,7 @@ msgstr "anahtarlar bu anahtarlıktan alınır"
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
@@ -2354,324 +2494,11 @@ msgstr ""
 "Kullanımı: gpg [seçenekler] [dosyalar]\n"
 "Bilinen güvenli anahtarlara göre imzaları kontrol eder\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"Bir değeri buraya işaretlemek size kalmış; bu değer herhangi bir 3. şahsa\n"
-"gönderilmeyecek. Bir güvence ağı sağlamak için bizim buna ihtiyacımız var;\n"
-"bunun (açıkça belirtilmeden oluşturulmuş) sertifikalar ağıyla\n"
-"hiçbir alakası yok."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"Web-of-Trust oluşturulabilmesi için GnuPG'ye hangi anahtarların son derece\n"
-"güvenli (bunlar gizli anahtarlarına erişiminiz olan anahtarlardır) "
-"olduğunun\n"
-"bildirilmesi gerekir. \"evet\" yanıtı bu anahtarın son derece güvenli\n"
-"olduğunun belirtilmesi için yeterlidir.\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr ""
-"Bu güvencesiz anahtarı yine de kullanmak istiyorsanız cevap olarak\n"
-" \"evet\" yazın."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Bu iletiyi göndereceğiniz adresin kullanıcı kimliğini giriniz."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"Kullanılacak algoritmayı seçiniz.\n"
-"\n"
-"DSA (nam-ı diğer DSS) Sayısal İmza Algortimasıdır ve\n"
-"sadece imzalar için kullanılabilir.\n"
-"\n"
-"Elgamal sadece şifreleme amacıyla kullanılabilen bir algoritmadır.\n"
-"\n"
-"RSA hem imzalamak hem de şifrelemek amacıyla kullanılabilir.\n"
-"\n"
-"İlk (asıl) anahtar daima imzalama yeteneğine sahip bir anahtar olmalıdır."
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"Genelde imzalama ve şifreleme için aynı anahtarı kullanmak iyi bir fikir\n"
-"değildir. Bu algoritma sadece belli alanlarda kullanılabilir.\n"
-"Lütfen güvenlik uzmanınıza danışın."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "Anahtar uzunluğunu giriniz"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "Cevap \"evet\" ya da \"hayır\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"İstenen değeri girin. ISO tarihi (YYYY-AA-GG) girmeniz mümkündür fakat\n"
-"iyi bir hata cevabı alamazsınız -- onun yerine sistem verilen değeri\n"
-"bir zaman aralığı olarak çözümlemeyi dener."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "Anahtar tutucunun ismini giriniz"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr ""
-"lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye edilir)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "Lütfen önbilgi girin (isteğe bağlı)"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"S iSim değiştirmek için.\n"
-"B önBilgiyi değiştirmek için.\n"
-"P e-Posta adresini değiştirmek için.\n"
-"D anahtar üretimine Devam etmek için.\n"
-"K anahtar üretiminden çıKmak için."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Yardımcı anahtarı üretmek istiyorsanız \"evet\" ya da \"e\" girin."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"Bir anahtarı bir kullanıcı kimlikle imzalamadan önce kullanıcı kimliğin\n"
-"içindeki ismin, anahtarın sahibine ait olup olmadığını kontrol etmelisiniz.\n"
-"\n"
-"\"0\" bu kontrolu yapmadığınız ve yapmayı da bilmediğiniz anlamındadır.\n"
-"\"1\" anahtar size sahibi tarafından gönderildi ama siz bu anahtarı başka\n"
-"      kaynaklardan doğrulamadınız anlamındadır. Bu kişisel doğrulama için\n"
-"      yeterlidir. En azında yarı anonim bir anahtar imzalaması yapmış\n"
-"      olursunuz.\n"
-"\"2\" ayrıntılı bir inceleme yapıldığı anlamındadır. Örneğin parmakizi ve\n"
-"      bir anahtarın foto kimliğiyle kullanıcı kimliğini karşılaştırmak\n"
-"      gibi denetimleri yapmışsınızdır.\n"
-"\"3\" inceden inceye bir doğrulama anlatır. Örneğin, şahıstaki anahtarın\n"
-"      sahibi ile anahtar parmak izini karşılaştırmışsınızdır ve anahtardaki\n"
-"      kullanıcı kimlikte belirtilen isme ait bir basılı kimlik belgesindeki\n"
-"      bir fotoğrafla şahsı karşılaştırmışsınızdır ve son olarak anahtar\n"
-"      sahibinin e-posta adresini kendisinin kullanmakta olduğunu da\n"
-"      denetlemişsinizdir.\n"
-"Burada 2 ve 3 için verilen örnekler *sadece* örnektir.\n"
-"Eninde sonunda bir anahtarı imzalarken \"ayrıntılı\" ve \"inceden inceye\" "
-"kontroller arasındaki ayrıma siz karar vereceksiniz.\n"
-"Bu kararı verebilecek durumda değilseniz \"0\" cevabını verin."
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr ""
-"Kullanıcı kimliklerinin TÜMünü imzalamak istiyorsanız \"evet\" ya da \"yes\" "
-"yazın"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"Bu kullanıcı kimliğini gerçekten silmek istiyorsanız \"evet\" girin.\n"
-"Böylece bütün sertifikaları kaybedeceksiniz!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Bu yardımcı anahtarı silme izni vermek istiyorsanız \"evet\" girin"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"Bu, anahtar üzerinde geçerli bir imzadır; anahtara ya da bu anahtarla\n"
-"sertifikalanmış bir diğer anahtara bir güvence bağlantısı sağlamakta\n"
-"önemli olabileceğinden normalde bu imzayı silmek istemezsiniz."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"Bu imza, anahtarına sahip olmadığınızdan, kontrol edilemez. Bu imzanın\n"
-"silinmesini hangi anahtarın kullanıldığını bilene kadar\n"
-"ertelemelisiniz çünkü bu imzalama anahtarı başka bir sertifikalı\n"
-"anahtar vasıtası ile bir güvence bağlantısı sağlayabilir."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "İmza geçersiz. Anahtarlıktan kaldırmak uygun olacak."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"Bu imza kullanıcı kimliğini anahtara bağlar. Öz-imzayı silmek hiç iyi\n"
-"bir fikir değil. GnuPG bu anahtarı bir daha hiç kullanamayabilir.\n"
-"Bunu sadece, eğer bu öz-imza bazı durumlarda geçerli değilse ya da\n"
-"kullanılabilir bir ikincisi var ise yapın."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"Tüm kullanıcı kimlik tercihlerini (ya da seçilen birini) mevcut tercihler\n"
-"listesine çevirir. Tüm etkilenen öz-imzaların zaman damgaları bir sonraki\n"
-"tarafından öne alınacaktır.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Lütfen son parolayı tekrarlayarak ne yazdığınızdan emin olun."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "İmzanın uygulanacağı dosyanın ismini verin"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Dosyanın üzerine yazılacaksa lütfen \"evet\" yazın"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"Lütfen yeni dosya ismini girin. Dosya ismini yazmadan RETURN tuşlarsanız\n"
-"parantez içinde gösterilen öntanımlı dosya kullanılacak."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"Sertifikalama için bir sebep belirtmelisiniz. İçeriğine bağlı olarak\n"
-"bu listeden seçebilirsiniz:\n"
-"  \"Anahtar tehlikede\"\n"
-"\tYetkisiz kişilerin gizli anahtarınıza erişebildiğine inanıyorsanız\n"
-"\tbunu seçin.\n"
-"  \"Anahtar geçici\"\n"
-"\tMevcut anahtarı daha yeni bir anahtar ile değiştirmişseniz bunu seçin.\n"
-"  \"Anahtar artık kullanılmayacak\"\n"
-"\tAnahtarı emekliye ayıracaksanız bunu seçin.\n"
-"  \"Kullanıcı kimliği artık geçersiz\"\n"
-"\tKullanıcı kimliği artık kullanılamayacak durumdaysa bunu\n"
-"\tseçin; genelde Eposta adresi geçersiz olduğunda kullanılır.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"İsterseniz, neden bu yürürlükten kaldırma sertifikasını\n"
-"verdiğinizi açıklayan bir metin girebilirsiniz.\n"
-"Lütfen bu metin kısa olsun. Bir boş satır metni bitirir.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "yardım mevcut değil"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
@@ -2870,13 +2697,13 @@ msgstr "anahtar %s: yeni anahtar - atlandı\n"
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtarlık yok: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
@@ -2965,7 +2792,7 @@ msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtarlık yok: %s\n"
@@ -3433,8 +3260,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:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -3445,19 +3272,19 @@ msgstr ""
 "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
 "değiştirilecek bir anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 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:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
@@ -3474,7 +3301,7 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
@@ -3831,94 +3658,94 @@ msgstr "gizliyi güncelleme başarısız: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 msgid "Notations: "
 msgstr "Simgelemler: "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 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:2698
+#: g10/keyedit.c:2699
 #, 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:2719
+#: g10/keyedit.c:2720
 #, 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:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3926,17 +3753,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:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -3945,7 +3772,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3954,74 +3781,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:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 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:3031
+#: g10/keyedit.c:3032
 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:3171
+#: g10/keyedit.c:3172
 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:3181
+#: g10/keyedit.c:3182
 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:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "geçersiz"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4031,204 +3858,204 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 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:3386
+#: g10/keyedit.c:3387
 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:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 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:3467
+#: g10/keyedit.c:3468
 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:3473
+#: g10/keyedit.c:3474
 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:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 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:3547
+#: g10/keyedit.c:3548
 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:3593
+#: g10/keyedit.c:3594
 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:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, 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:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, 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:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 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:4147
+#: g10/keyedit.c:4148
 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:4209
+#: g10/keyedit.c:4210
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 msgid "Proceed? (y/N) "
 msgstr "Devam? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%s çittirmeli kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 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:4659
+#: g10/keyedit.c:4660
 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:4686
+#: g10/keyedit.c:4687
 #, 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:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, 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:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 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:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, 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:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, 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:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4270,12 +4097,12 @@ msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
@@ -4303,109 +4130,119 @@ msgstr "Şifrele"
 msgid "Authenticate"
 msgstr "Kimlik kanıtla"
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "OoŞşKkçÇ"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "bir %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "Şimdilik mümkün eylemler: "
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA anahtar çifti %u bit olacak.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4421,7 +4258,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4437,38 +4274,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (%s) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4476,11 +4313,11 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4496,44 +4333,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4544,7 +4381,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
@@ -4560,24 +4397,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4585,12 +4422,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4602,7 +4439,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4615,50 +4452,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtarlık yok: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtarlık yok: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, 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:3377
+#: g10/keygen.c:3391
 #, 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:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 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"
@@ -4666,19 +4503,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:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, 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:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4686,26 +4523,26 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 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:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, 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:3891
+#: g10/keygen.c:3905
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -5003,193 +4840,193 @@ msgstr "bilinmeyen özümleme algoritması ile üretilmiş anahtar parolası %d\
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, 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:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, 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:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, 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:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 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:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 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:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 msgid "no signature found\n"
 msgstr "hiç imza yok\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu belirsiz imza verisi elde edilemiyor\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, 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:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -5208,80 +5045,85 @@ msgstr "fstat(%d) %s de başarısız: %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "UYARI: deneysel %s genel anahtar algoritması kullanılıyor\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "UYARI: deneysel %s şifreleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "UYARI: deneysel %s özümleme algoritması kullanılıyor\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "UYARI: %s özümleme algoritması artık önerilmiyor.\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, 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:652
+#: g10/misc.c:715
 #, 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:656
+#: g10/misc.c:719
 #, 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:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, 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:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, 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:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
@@ -6055,12 +5897,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:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -6068,17 +5910,17 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) özümleme algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -6397,7 +6239,7 @@ msgstr "son derece"
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
@@ -6425,26 +6267,26 @@ msgstr "lütfen bir --check-trustdb yapın\n"
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %s için genel anahtar yok\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6452,7 +6294,7 @@ msgstr ""
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6591,13 +6433,13 @@ msgstr ""
 "Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
 "Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 #, fuzzy
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
@@ -6658,11 +6500,11 @@ msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 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:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
@@ -6770,12 +6612,12 @@ msgstr "kart %s özet algoritmasını desteklemiyor\n"
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 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:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -6784,7 +6626,7 @@ msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
 msgid "run in multi server mode (foreground)"
 msgstr "çoklu sunucu kipinde çalışır (önalanda)"
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 msgid "read options from file"
 msgstr "seçenekler dosyadan okunur"
 
@@ -6845,21 +6687,21 @@ msgstr "fd %d için eylemci sonlandı\n"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "geçersiz radix64 karakteri %02x atlandı\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "çalışan dirmngr yok - `%s' başlatılıyor\n"
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "DIRMNGR_INFO ortam değişkeni hatalı\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "dirmngr protokolünün %d. sürümü desteklenmiyor\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
 
@@ -6868,11 +6710,11 @@ msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 msgid "shell"
 msgstr ""
 
@@ -6911,8 +6753,8 @@ msgstr "harici bir sertifikacı arar\n"
 msgid "number of issuers matching: %d\n"
 msgstr "eşleşen sertifikacı sayısı: %d\n"
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "ayrılmış anahtar veritabanı elde edilemedi: %s\n"
 
@@ -7042,60 +6884,60 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "sertifikacı kim belli değil"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr "kök sertifika güvenilir olarak imli değil"
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, 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:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr "sertifika zinciri çok uzun\n"
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr "sertifikacı belli değil"
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 msgid "certificate has a BAD signature"
 msgstr "sertifika KÖTÜ bir imzaya sahip"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 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:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "sertifika zinciri çok uzun\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "yinelenmiş sertifika `%s' silindi\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "kök sertifika güvenilir olarak imli değil"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -7110,7 +6952,7 @@ msgstr "DSA anahtarı %s, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(bu, MD2 algoritmasıdır)\n"
 
@@ -7227,6 +7069,112 @@ msgstr "%d. satır: `%s' anahtar maşası tarafından alınırken hata: %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "%d. satır: anahtar üretimi başarısızlığa uğradı: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (sadece imzalamak için)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (2) Şifreleme anahtarı\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, fuzzy, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "bir %s anahtarı için olası eylemler: "
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) DSA (yalnız imzalamak için)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (yalnız imzalamak için)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (sadece şifrelemek için)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "%d. satır: konu ismi belirtilmemiş\n"
+
+#: sm/certreqgen-ui.c:211
+#, fuzzy, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr "%d. satır: konu ismi yaftası `%.*s' geçersiz\n"
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "%d. satır: konu ismi yaftası `%.*s' geçersiz\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "E-posta adresiniz: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "Yeni dosya ismini giriniz"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr ""
+"İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
+
+#: sm/certreqgen-ui.c:244
+msgid "Enter URIs"
+msgstr ""
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(bu, RC2 algoritmasıdır)\n"
@@ -7260,185 +7208,185 @@ msgstr "sertifika `%s' silindi\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "\"%s\" sertifikası silinemedi: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 msgid "no valid recipients given\n"
 msgstr "geçerli alıcılar verilmedi\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 msgid "|[FILE]|make a signature"
 msgstr "|[DOSYA]|bir imza yapar"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[DOSYA]|açıkça okunabilen bir imza yapar"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 msgid "list external keys"
 msgstr "harici anahtarları listeler"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 msgid "list certificate chain"
 msgstr "sertifika zincirini listeler"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 msgid "remove key from the public keyring"
 msgstr "anahtarları genel anahtarlıktan kaldırır"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 msgid "import certificates"
 msgstr "sertifikaları ithal eder"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 msgid "export certificates"
 msgstr "sertifikaları ihraç eder"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "register a smartcard"
 msgstr "bir akıllı kartı kayda alır"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-tool'u çalıştırır"
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 msgid "change a passphrase"
 msgstr "anahtar parolası değiştirir"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 msgid "create base-64 encoded output"
 msgstr "base-64 kodlu çıktı oluşturur"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr "girdinin PEM biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr "girdinin ikilik biçimde olduğu kabul edilir"
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr "elverişliyse sistemin dirmngr'ı kullanılır"
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr "asla bir CRL sormaz"
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr "doğruluğu OCSP kullarak sınar"
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr "|N|içerilecek sertifika sayısı"
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr "sertifika poliçeleri sınanmaz"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr "kayıp sertifikacı sertifikalarını alır"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 msgid "use the default key as default recipient"
 msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 #, fuzzy
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 msgid "force v3 signatures"
 msgstr "v3 imzalarına zorlar"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr "şifreleme için daima bir MDC kullanılır"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtarlığı anahtarlık listesine ekler"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtarlığı listeye ekler"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 msgid "|N|use compress algorithm N"
 msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgsm [seçenekler] [dosyalar] (yardım için -h)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7448,35 +7396,35 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 msgid "usage: gpgsm [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "`%s'e şifrelenemez: %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr "bu komut henüz gerçeklenmedi\n"
 
@@ -7585,7 +7533,7 @@ msgstr ""
 "\n"
 "%s%sBunu yapmak istediğinizden emin misiniz?"
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7609,28 +7557,28 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "nitelikli sertifika için sınama başarısız: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 msgid "Signature made "
 msgstr "İmza "
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr "[belirtilmeyen tarihte]"
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr " sertifika kimliği %08lX kullanılarak yapıldı\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 msgid "Good signature from"
 msgstr "Buradaki imzeler iyi:"
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 msgid "                aka"
 msgstr "        nam-ı diğer"
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "Bu bir öz-imza olacak.\n"
@@ -8085,6 +8033,318 @@ msgstr "hiç sınıf sağlanmamış\n"
 msgid "class %s is not supported\n"
 msgstr "%s sınıfı desteklenmiyor\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Kullanımı: gpg-connect-agent [seçenekler] (yardım için -h)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "Bir değeri buraya işaretlemek size kalmış; bu değer herhangi bir 3. "
+#~ "şahsa\n"
+#~ "gönderilmeyecek. Bir güvence ağı sağlamak için bizim buna ihtiyacımız "
+#~ "var;\n"
+#~ "bunun (açıkça belirtilmeden oluşturulmuş) sertifikalar ağıyla\n"
+#~ "hiçbir alakası yok."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "Web-of-Trust oluşturulabilmesi için GnuPG'ye hangi anahtarların son "
+#~ "derece\n"
+#~ "güvenli (bunlar gizli anahtarlarına erişiminiz olan anahtarlardır) "
+#~ "olduğunun\n"
+#~ "bildirilmesi gerekir. \"evet\" yanıtı bu anahtarın son derece güvenli\n"
+#~ "olduğunun belirtilmesi için yeterlidir.\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr ""
+#~ "Bu güvencesiz anahtarı yine de kullanmak istiyorsanız cevap olarak\n"
+#~ " \"evet\" yazın."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "Bu iletiyi göndereceğiniz adresin kullanıcı kimliğini giriniz."
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "Kullanılacak algoritmayı seçiniz.\n"
+#~ "\n"
+#~ "DSA (nam-ı diğer DSS) Sayısal İmza Algortimasıdır ve\n"
+#~ "sadece imzalar için kullanılabilir.\n"
+#~ "\n"
+#~ "Elgamal sadece şifreleme amacıyla kullanılabilen bir algoritmadır.\n"
+#~ "\n"
+#~ "RSA hem imzalamak hem de şifrelemek amacıyla kullanılabilir.\n"
+#~ "\n"
+#~ "İlk (asıl) anahtar daima imzalama yeteneğine sahip bir anahtar olmalıdır."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "Genelde imzalama ve şifreleme için aynı anahtarı kullanmak iyi bir fikir\n"
+#~ "değildir. Bu algoritma sadece belli alanlarda kullanılabilir.\n"
+#~ "Lütfen güvenlik uzmanınıza danışın."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "Anahtar uzunluğunu giriniz"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "Cevap \"evet\" ya da \"hayır\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "İstenen değeri girin. ISO tarihi (YYYY-AA-GG) girmeniz mümkündür fakat\n"
+#~ "iyi bir hata cevabı alamazsınız -- onun yerine sistem verilen değeri\n"
+#~ "bir zaman aralığı olarak çözümlemeyi dener."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "Anahtar tutucunun ismini giriniz"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr ""
+#~ "lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye "
+#~ "edilir)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "Lütfen önbilgi girin (isteğe bağlı)"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "S iSim değiştirmek için.\n"
+#~ "B önBilgiyi değiştirmek için.\n"
+#~ "P e-Posta adresini değiştirmek için.\n"
+#~ "D anahtar üretimine Devam etmek için.\n"
+#~ "K anahtar üretiminden çıKmak için."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "Yardımcı anahtarı üretmek istiyorsanız \"evet\" ya da \"e\" girin."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "Bir anahtarı bir kullanıcı kimlikle imzalamadan önce kullanıcı kimliğin\n"
+#~ "içindeki ismin, anahtarın sahibine ait olup olmadığını kontrol "
+#~ "etmelisiniz.\n"
+#~ "\n"
+#~ "\"0\" bu kontrolu yapmadığınız ve yapmayı da bilmediğiniz anlamındadır.\n"
+#~ "\"1\" anahtar size sahibi tarafından gönderildi ama siz bu anahtarı "
+#~ "başka\n"
+#~ "      kaynaklardan doğrulamadınız anlamındadır. Bu kişisel doğrulama "
+#~ "için\n"
+#~ "      yeterlidir. En azında yarı anonim bir anahtar imzalaması yapmış\n"
+#~ "      olursunuz.\n"
+#~ "\"2\" ayrıntılı bir inceleme yapıldığı anlamındadır. Örneğin parmakizi "
+#~ "ve\n"
+#~ "      bir anahtarın foto kimliğiyle kullanıcı kimliğini karşılaştırmak\n"
+#~ "      gibi denetimleri yapmışsınızdır.\n"
+#~ "\"3\" inceden inceye bir doğrulama anlatır. Örneğin, şahıstaki anahtarın\n"
+#~ "      sahibi ile anahtar parmak izini karşılaştırmışsınızdır ve "
+#~ "anahtardaki\n"
+#~ "      kullanıcı kimlikte belirtilen isme ait bir basılı kimlik "
+#~ "belgesindeki\n"
+#~ "      bir fotoğrafla şahsı karşılaştırmışsınızdır ve son olarak anahtar\n"
+#~ "      sahibinin e-posta adresini kendisinin kullanmakta olduğunu da\n"
+#~ "      denetlemişsinizdir.\n"
+#~ "Burada 2 ve 3 için verilen örnekler *sadece* örnektir.\n"
+#~ "Eninde sonunda bir anahtarı imzalarken \"ayrıntılı\" ve \"inceden inceye"
+#~ "\" kontroller arasındaki ayrıma siz karar vereceksiniz.\n"
+#~ "Bu kararı verebilecek durumda değilseniz \"0\" cevabını verin."
+
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr ""
+#~ "Kullanıcı kimliklerinin TÜMünü imzalamak istiyorsanız \"evet\" ya da \"yes"
+#~ "\" yazın"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "Bu kullanıcı kimliğini gerçekten silmek istiyorsanız \"evet\" girin.\n"
+#~ "Böylece bütün sertifikaları kaybedeceksiniz!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "Bu yardımcı anahtarı silme izni vermek istiyorsanız \"evet\" girin"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "Bu, anahtar üzerinde geçerli bir imzadır; anahtara ya da bu anahtarla\n"
+#~ "sertifikalanmış bir diğer anahtara bir güvence bağlantısı sağlamakta\n"
+#~ "önemli olabileceğinden normalde bu imzayı silmek istemezsiniz."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "Bu imza, anahtarına sahip olmadığınızdan, kontrol edilemez. Bu imzanın\n"
+#~ "silinmesini hangi anahtarın kullanıldığını bilene kadar\n"
+#~ "ertelemelisiniz çünkü bu imzalama anahtarı başka bir sertifikalı\n"
+#~ "anahtar vasıtası ile bir güvence bağlantısı sağlayabilir."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr "İmza geçersiz. Anahtarlıktan kaldırmak uygun olacak."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "Bu imza kullanıcı kimliğini anahtara bağlar. Öz-imzayı silmek hiç iyi\n"
+#~ "bir fikir değil. GnuPG bu anahtarı bir daha hiç kullanamayabilir.\n"
+#~ "Bunu sadece, eğer bu öz-imza bazı durumlarda geçerli değilse ya da\n"
+#~ "kullanılabilir bir ikincisi var ise yapın."
+
+#~ 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 ""
+#~ "Tüm kullanıcı kimlik tercihlerini (ya da seçilen birini) mevcut "
+#~ "tercihler\n"
+#~ "listesine çevirir. Tüm etkilenen öz-imzaların zaman damgaları bir "
+#~ "sonraki\n"
+#~ "tarafından öne alınacaktır.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "Lütfen son parolayı tekrarlayarak ne yazdığınızdan emin olun."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "İmzanın uygulanacağı dosyanın ismini verin"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "Dosyanın üzerine yazılacaksa lütfen \"evet\" yazın"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "Lütfen yeni dosya ismini girin. Dosya ismini yazmadan RETURN tuşlarsanız\n"
+#~ "parantez içinde gösterilen öntanımlı dosya kullanılacak."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "Sertifikalama için bir sebep belirtmelisiniz. İçeriğine bağlı olarak\n"
+#~ "bu listeden seçebilirsiniz:\n"
+#~ "  \"Anahtar tehlikede\"\n"
+#~ "\tYetkisiz kişilerin gizli anahtarınıza erişebildiğine inanıyorsanız\n"
+#~ "\tbunu seçin.\n"
+#~ "  \"Anahtar geçici\"\n"
+#~ "\tMevcut anahtarı daha yeni bir anahtar ile değiştirmişseniz bunu seçin.\n"
+#~ "  \"Anahtar artık kullanılmayacak\"\n"
+#~ "\tAnahtarı emekliye ayıracaksanız bunu seçin.\n"
+#~ "  \"Kullanıcı kimliği artık geçersiz\"\n"
+#~ "\tKullanıcı kimliği artık kullanılamayacak durumdaysa bunu\n"
+#~ "\tseçin; genelde Eposta adresi geçersiz olduğunda kullanılır.\n"
+
+#~ 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 ""
+#~ "İsterseniz, neden bu yürürlükten kaldırma sertifikasını\n"
+#~ "verdiğinizi açıklayan bir metin girebilirsiniz.\n"
+#~ "Lütfen bu metin kısa olsun. Bir boş satır metni bitirir.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "simgelem verisi v3 (PGP 2.x tarzı) imzalara konulamaz\n"
 
@@ -8102,12 +8362,6 @@ msgstr "%s sınıfı desteklenmiyor\n"
 #~ "please see http://www.gnupg.org/download/iconv.html for more information\n"
 #~ msgstr "daha fazla bilgi için lütfen %s adresine bakınız\n"
 
-#~ msgid "no running gpg-agent - starting one\n"
-#~ msgstr "çalışan gpg-agent yok - bir tane başlatılıyor\n"
-
-#~ msgid "can't connect to the agent - trying fall back\n"
-#~ msgstr "aracıya bağlanılamıyor - son çareye başvuruluyor\n"
-
 #, fuzzy
 #~ msgid "key generation is not available from the commandline\n"
 #~ msgstr "gpg-agent bu oturumda kullanılamaz\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 03f2f2f7a..c9f335fda 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -44,51 +44,51 @@ msgstr "请输入密码：这是一个秘密的句子 \n"
 msgid "Quality:"
 msgstr "有效性：%s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有无效的字符\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "损坏的多精度整数(MPI)"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "错误的密码"
@@ -98,21 +98,21 @@ msgstr "错误的密码"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -194,8 +194,8 @@ msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -274,7 +274,7 @@ msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -293,13 +293,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "详细模式"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
@@ -381,8 +381,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
@@ -400,29 +400,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
@@ -534,12 +535,12 @@ msgstr "%s：已跳过：%s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -610,7 +611,7 @@ msgstr "已取消"
 msgid "error opening `%s': %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "配置文件‘%s’：%s\n"
@@ -635,7 +636,7 @@ msgstr "读取‘%s’错误：%s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -860,6 +861,145 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "证书已损坏"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "证书已损坏"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "列出所有可用数据"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s：钥匙环已建立\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "有效性：%s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"支持的算法：\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "未被加密"
+
+#: common/audit.c:740
+#, fuzzy
+msgid "Number of recipients"
+msgstr "当前收件人：\n"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "签名验证已被抑制\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "签名建立于 %s\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "未找到签名\n"
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "无效的‘%s’散列算法\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "签名建立于 %s\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "这把密钥已经过期！"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "证书已损坏"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "证书已损坏"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "证书已损坏"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "未知的版本"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "‘%s’没有可用的帮助"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "结尾行有问题\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -976,13 +1116,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "您的选择？ "
 
@@ -1149,7 +1289,7 @@ msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
@@ -1253,18 +1393,18 @@ msgstr "无效的指令(尝试“help”)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1304,7 +1444,7 @@ msgstr "公钥“%s”有对应的私钥！\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -1323,7 +1463,7 @@ msgstr "使用对称加密算法 %s\n"
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
@@ -1348,7 +1488,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1375,17 +1515,17 @@ msgstr "%s/%s 已经加密给：“%s”\n"
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
 
-#: g10/encr-data.c:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "处理加密包有问题\n"
 
@@ -1525,7 +1665,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:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
@@ -1540,7 +1680,7 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1556,27 +1696,27 @@ msgstr "|[文件名]|生成一份签名"
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "列出密钥"
 
@@ -1588,11 +1728,11 @@ msgstr "列出密钥和签名"
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "列出私钥"
 
@@ -1628,11 +1768,11 @@ msgstr "生成一份吊销证书"
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
@@ -1668,11 +1808,11 @@ msgstr "更新信任度数据库"
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1683,32 +1823,32 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
@@ -1724,7 +1864,7 @@ msgstr "行为严格遵循 OpenPGP 定义"
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1732,7 +1872,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1772,7 +1912,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1792,11 +1932,11 @@ msgstr "对称加密："
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1804,7 +1944,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
@@ -1875,449 +2015,449 @@ msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2970
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2976
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:2989
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3094
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3048
+#: g10/gpg.c:3096
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3212
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3217
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -2329,7 +2469,7 @@ msgstr "从这个钥匙环里取用密钥"
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳矛盾仅视为警告"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
@@ -2345,309 +2485,11 @@ msgstr ""
 "语法：gpg [选项] [文件]\n"
 "用已知的受信任密钥来检查签名\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"在这里指定的数值完全由您自己决定；这些数值永远不会被输出给任何第三方。\n"
-"我们需要它来实现“信任网络”；这跟隐含建立起来的“验证网络”无关。"
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"要建立起信任网络，GnuPG 需要知道哪些密钥是可绝对信任的――通常\n"
-"就是您拥有私钥的那些密钥。回答“yes”将此密钥设成可绝对信任的\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "如果您无论如何要使用这把未被信任的密钥，请回答“yes”。"
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "输入您要递送的报文的接收者的用户标识。"
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"选择使用的算法。\n"
-"\n"
-"DSA (也叫 DSS)即“数字签名算法”(美国国家标准)，只能够用作签名。\n"
-"\n"
-"Elgamal 是一种只能用作加密的算法。\n"
-"\n"
-"RSA 可以用作签名或加密。\n"
-"\n"
-"第一把密钥(主钥)必须具有签名的能力。"
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"通常来说用同一把密钥签名及加密并不是个好主意。这个算法只在特定的情况\n"
-"下使用。请先咨询安全方面的专家。"
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "请输入密钥的尺寸"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "请回答“yes”或“no”"
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"请输入提示所要求的数值。\n"
-"您可以输入 ISO 日期格式(YYYY-MM-DD)，但是出错时您不会得到友好的响应\n"
-"――系统会尝试将给定值解释为时间间隔。"
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "请输入密钥持有人的名字"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "请输入电子邮件地址(可选项，但强烈推荐使用)"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "请输入注释(可选项)"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  修改姓名。\n"
-"C  修改注释。\n"
-"E  修改电子邮件地址。\n"
-"O  继续产生密钥。\n"
-"Q  中止产生密钥。"
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "如果您允许生成子钥，请回答“yes”(或者“y”)。"
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"当您为某把密钥上某个用户标识添加签名时，您必须首先验证这把密钥确实属于\n"
-"署名于它的用户标识上的那个人。了解到您曾多么谨慎地对此进行过验证，对其\n"
-"他人是非常有用的\n"
-"\n"
-"“0” 表示您对您有多么仔细地验证这把密钥的问题不表态。\n"
-"\n"
-"“1” 表示您相信这把密钥属于那个声明是主人的人，但是您不能或根本没有验\n"
-"      证过。如果您为一把属于类似虚拟人物的密钥签名，这个选择很有用。\n"
-"\n"
-"“2” 表示您随意地验证了那把密钥。例如，您验证了这把密钥的指纹，或比对\n"
-"      照片验证了用户标识。\n"
-"\n"
-"“3” 表示您做了大量而详尽的验证密钥工作。例如，您同密钥持有人验证了密\n"
-"      钥指纹，而且通过查验附带照片而难以伪造的证件(如护照)确认了密钥持\n"
-"      有人的姓名与密钥上的用户标识一致，最后您还(通过电子邮件往来)验证\n"
-"      了密钥上的电子邮件地址确实属于密钥持有人。\n"
-"\n"
-"请注意上述关于验证级别 2 和 3 的说明仅是例子而已。最终还是由您自己决定\n"
-"当您为其他密钥签名时，什么是“随意”，而什么是“大量而详尽”。\n"
-"\n"
-"如果您不知道应该选什么答案的话，就选“0”。"
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "如果您想要为所有用户标识签名的话就选“yes”"
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"如果您真的想要删除这个用户标识的话就回答“yes”。\n"
-"所有相关认证在此之后也会丢失！"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "如果可以删除这把子钥，请回答“yes”"
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"这是一份在这把密钥上有效的签名；通常您不会想要删除这份签名，\n"
-"因为要与这把密钥或拥有这把密钥的签名的密钥建立认证关系可能\n"
-"相当重要。"
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"这份签名无法被检验，因为您没有相应的密钥。您应该暂缓删除它，\n"
-"直到您知道此签名使用了哪一把密钥；因为用来签名的密钥可能与\n"
-"其他已经验证的密钥存在信任关系。"
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "这份签名无效。应当把它从您的钥匙环里删除。"
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"这是一份将密钥与用户标识相联系的签名。通常不应删除这样的签名。\n"
-"事实上，一旦删除，GnuPG可能从此就不能再使用这把密钥了。因此，\n"
-"只有在这把密钥的第一个自身签名因某些原因失效，而有第二个自身签\n"
-"字可用的情况下才这么做。"
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"用现有的首选项更新所有(或选定的)用户标识的首选项。所有受影响的自身签\n"
-"字的时间戳都会增加一秒钟。\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "请输入密码：这是一个秘密的句子 \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "请再次输入上次的密码，以确定您到底键入了些什么。"
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "请给定要添加签名的文件名"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "如果可以覆盖这个文件，请回答“yes”"
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"请输入一个新的文件名。如果您直接按下了回车，那么就会使用显示在括\n"
-"号中的默认的文件名。"
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"您应该为这份吊销证书指定一个原因。根据情境的不同，您可以从下列清单中\n"
-"选出一项：\n"
-"  “密钥已泄漏”\n"
-"      如果您相信有某个未经许可的人已取得了您的私钥，请选此项。\n"
-"  “密钥已替换”\n"
-"      如果您已用一把新密钥代替旧的，请选此项。\n"
-"  “密钥不再被使用”\n"
-"      如果您已决定让这把密钥退休，请选此项\n"
-"  “用户标识不再有效”\n"
-"      如果这个用户标识不再被使用了，请选此项；这通常用表明某个电子邮\n"
-"      件地址已不再有效。\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"您也可以输入一串文字，描述发布这份吊销证书的理由。请尽量使这段文\n"
-"字简明扼要。\n"
-"键入一空行以结束输入。\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "没有可用的帮助"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "‘%s’没有可用的帮助"
@@ -2839,13 +2681,13 @@ msgstr "密钥 %s：新密钥――已跳过\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
@@ -2934,7 +2776,7 @@ msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
@@ -3382,8 +3224,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
@@ -3392,19 +3234,19 @@ msgstr "签名时失败： %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
@@ -3421,7 +3263,7 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
@@ -3751,114 +3593,114 @@ msgstr "更新私钥失败：%s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 msgid "Notations: "
 msgstr "注记："
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2698
+#: g10/keyedit.c:2699
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2720
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3867,74 +3709,74 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签名吗？(y/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3943,193 +3785,193 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 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:3448
+#: g10/keyedit.c:3449
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3474
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签名\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
-#: g10/keyedit.c:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 msgid "Enter the notation: "
 msgstr "输入注记："
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N)"
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -4169,12 +4011,12 @@ msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
@@ -4200,109 +4042,119 @@ msgstr "加密"
 msgid "Authenticate"
 msgstr "认证"
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥可能的操作："
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "目前允许的操作："
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 选择是否用于签名\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 选择是否用于加密\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 选择是否用于认证\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (仅用于签名)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (自定义用途)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (仅用于加密)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (仅用于签名)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 密钥对会有 %u 位。\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要用多大的密钥尺寸？(%u)"
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4318,7 +4170,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4334,38 +4186,38 @@ msgstr ""
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是多久？(%s) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4373,11 +4225,11 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4393,44 +4245,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4441,7 +4293,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -4456,23 +4308,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4480,12 +4332,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4497,7 +4349,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4507,50 +4359,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签名。\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 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"
@@ -4558,42 +4410,42 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
@@ -4890,189 +4742,189 @@ msgstr "密码由未知的散列算法 %d 生成\n"
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：报文未受到完整的保护\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发件者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 msgid "no signature found\n"
 msgstr "未找到签名\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "签名验证已被抑制\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理这些有歧义的签名\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签名建立于 %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于“%s”"
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于“%s”"
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于“%s”"
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签名\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
@@ -5091,80 +4943,85 @@ msgstr "fstat(%d) 在 %s 中出错：%s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 使用试验性质的公钥算法 %s\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "警告：不建议使用散列算法 %s\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告：使用试验性质的对称加密算法 %s\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告：使用试验性质的散列算法 %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告：不建议使用散列算法 %s\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：不建议使用该选项“%s”\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
 
-#: g10/misc.c:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "不压缩"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
@@ -5897,25 +5754,25 @@ msgstr "检查已建立的签名时发生错误： %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
 
-#: g10/sign.c:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
@@ -6231,7 +6088,7 @@ msgstr "绝对"
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
@@ -6259,33 +6116,33 @@ msgstr "请执行一次 --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@ -6426,12 +6283,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
@@ -6492,11 +6349,11 @@ msgstr "验证 CHV%d 失败：%s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
@@ -6603,12 +6460,12 @@ msgstr "卡不支持散列算法 %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@ -6617,7 +6474,7 @@ msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "从‘%s’读取选项\n"
@@ -6677,22 +6534,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6701,11 +6558,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 msgid "shell"
 msgstr ""
 
@@ -6745,8 +6602,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "无法存储密钥：%s\n"
@@ -6880,61 +6737,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "生成一份吊销证书"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "验证签名"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "首选项‘%s’重复\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "已建立吊销证书。\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "证书已损坏"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -6949,7 +6806,7 @@ msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7070,6 +6927,112 @@ msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "生成密钥失败：%s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (仅用于签名)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "  (2) 加密密钥\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, fuzzy, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "%s 密钥可能的操作："
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) DSA (仅用于签名)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (仅用于签名)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (仅用于加密)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(不给定描述)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "无效的‘%s’散列算法\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "电子邮件地址："
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"输入用户标识。以空白行结束："
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "请输入新的文件名"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "请输入描述(可选)；以空白行结束：\n"
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "输入 PIN："
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7103,204 +7066,204 @@ msgstr "首选项‘%s’重复\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(不给定描述)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "列出私钥"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "register a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密码"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "输出经 ASCII 封装"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "检查签名"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "从这个钥匙环里取用密钥"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "要有私钥才能这么做。\n"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "未知的对称加密算法"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "未知的压缩算法"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7311,36 +7274,36 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法：gpg [选项] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7447,7 +7410,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7466,31 +7429,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "签名建立于 %s\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "完好的签名，来自于“%s”"
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "              亦即“%s”"
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "这将是一个自身签名。\n"
@@ -7947,6 +7910,291 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "不支持保护散列 %d\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "在这里指定的数值完全由您自己决定；这些数值永远不会被输出给任何第三方。\n"
+#~ "我们需要它来实现“信任网络”；这跟隐含建立起来的“验证网络”无关。"
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "要建立起信任网络，GnuPG 需要知道哪些密钥是可绝对信任的――通常\n"
+#~ "就是您拥有私钥的那些密钥。回答“yes”将此密钥设成可绝对信任的\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr "如果您无论如何要使用这把未被信任的密钥，请回答“yes”。"
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "输入您要递送的报文的接收者的用户标识。"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "选择使用的算法。\n"
+#~ "\n"
+#~ "DSA (也叫 DSS)即“数字签名算法”(美国国家标准)，只能够用作签名。\n"
+#~ "\n"
+#~ "Elgamal 是一种只能用作加密的算法。\n"
+#~ "\n"
+#~ "RSA 可以用作签名或加密。\n"
+#~ "\n"
+#~ "第一把密钥(主钥)必须具有签名的能力。"
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "通常来说用同一把密钥签名及加密并不是个好主意。这个算法只在特定的情况\n"
+#~ "下使用。请先咨询安全方面的专家。"
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "请输入密钥的尺寸"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "请回答“yes”或“no”"
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "请输入提示所要求的数值。\n"
+#~ "您可以输入 ISO 日期格式(YYYY-MM-DD)，但是出错时您不会得到友好的响应\n"
+#~ "――系统会尝试将给定值解释为时间间隔。"
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "请输入密钥持有人的名字"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "请输入电子邮件地址(可选项，但强烈推荐使用)"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "请输入注释(可选项)"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  修改姓名。\n"
+#~ "C  修改注释。\n"
+#~ "E  修改电子邮件地址。\n"
+#~ "O  继续产生密钥。\n"
+#~ "Q  中止产生密钥。"
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "如果您允许生成子钥，请回答“yes”(或者“y”)。"
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "当您为某把密钥上某个用户标识添加签名时，您必须首先验证这把密钥确实属于\n"
+#~ "署名于它的用户标识上的那个人。了解到您曾多么谨慎地对此进行过验证，对其\n"
+#~ "他人是非常有用的\n"
+#~ "\n"
+#~ "“0” 表示您对您有多么仔细地验证这把密钥的问题不表态。\n"
+#~ "\n"
+#~ "“1” 表示您相信这把密钥属于那个声明是主人的人，但是您不能或根本没有验\n"
+#~ "      证过。如果您为一把属于类似虚拟人物的密钥签名，这个选择很有用。\n"
+#~ "\n"
+#~ "“2” 表示您随意地验证了那把密钥。例如，您验证了这把密钥的指纹，或比对\n"
+#~ "      照片验证了用户标识。\n"
+#~ "\n"
+#~ "“3” 表示您做了大量而详尽的验证密钥工作。例如，您同密钥持有人验证了密\n"
+#~ "      钥指纹，而且通过查验附带照片而难以伪造的证件(如护照)确认了密钥持\n"
+#~ "      有人的姓名与密钥上的用户标识一致，最后您还(通过电子邮件往来)验证\n"
+#~ "      了密钥上的电子邮件地址确实属于密钥持有人。\n"
+#~ "\n"
+#~ "请注意上述关于验证级别 2 和 3 的说明仅是例子而已。最终还是由您自己决定\n"
+#~ "当您为其他密钥签名时，什么是“随意”，而什么是“大量而详尽”。\n"
+#~ "\n"
+#~ "如果您不知道应该选什么答案的话，就选“0”。"
+
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "如果您想要为所有用户标识签名的话就选“yes”"
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "如果您真的想要删除这个用户标识的话就回答“yes”。\n"
+#~ "所有相关认证在此之后也会丢失！"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "如果可以删除这把子钥，请回答“yes”"
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "这是一份在这把密钥上有效的签名；通常您不会想要删除这份签名，\n"
+#~ "因为要与这把密钥或拥有这把密钥的签名的密钥建立认证关系可能\n"
+#~ "相当重要。"
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "这份签名无法被检验，因为您没有相应的密钥。您应该暂缓删除它，\n"
+#~ "直到您知道此签名使用了哪一把密钥；因为用来签名的密钥可能与\n"
+#~ "其他已经验证的密钥存在信任关系。"
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr "这份签名无效。应当把它从您的钥匙环里删除。"
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "这是一份将密钥与用户标识相联系的签名。通常不应删除这样的签名。\n"
+#~ "事实上，一旦删除，GnuPG可能从此就不能再使用这把密钥了。因此，\n"
+#~ "只有在这把密钥的第一个自身签名因某些原因失效，而有第二个自身签\n"
+#~ "字可用的情况下才这么做。"
+
+#~ 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 ""
+#~ "用现有的首选项更新所有(或选定的)用户标识的首选项。所有受影响的自身签\n"
+#~ "字的时间戳都会增加一秒钟。\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "请输入密码：这是一个秘密的句子 \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "请再次输入上次的密码，以确定您到底键入了些什么。"
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "请给定要添加签名的文件名"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "如果可以覆盖这个文件，请回答“yes”"
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "请输入一个新的文件名。如果您直接按下了回车，那么就会使用显示在括\n"
+#~ "号中的默认的文件名。"
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "您应该为这份吊销证书指定一个原因。根据情境的不同，您可以从下列清单中\n"
+#~ "选出一项：\n"
+#~ "  “密钥已泄漏”\n"
+#~ "      如果您相信有某个未经许可的人已取得了您的私钥，请选此项。\n"
+#~ "  “密钥已替换”\n"
+#~ "      如果您已用一把新密钥代替旧的，请选此项。\n"
+#~ "  “密钥不再被使用”\n"
+#~ "      如果您已决定让这把密钥退休，请选此项\n"
+#~ "  “用户标识不再有效”\n"
+#~ "      如果这个用户标识不再被使用了，请选此项；这通常用表明某个电子邮\n"
+#~ "      件地址已不再有效。\n"
+
+#~ 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 ""
+#~ "您也可以输入一串文字，描述发布这份吊销证书的理由。请尽量使这段文\n"
+#~ "字简明扼要。\n"
+#~ "键入一空行以结束输入。\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n"
 
@@ -8095,9 +8343,6 @@ msgstr "不支持保护散列 %d\n"
 #~ msgid "Enter Admin PIN: "
 #~ msgstr "输入管理员 PIN："
 
-#~ msgid "Enter PIN: "
-#~ msgstr "输入 PIN："
-
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "注意：%s 本版本中不可用\n"
 
@@ -8114,9 +8359,6 @@ msgstr "不支持保护散列 %d\n"
 #~ msgid "unknown packet type"
 #~ msgstr "未知的包类型"
 
-#~ msgid "unknown version"
-#~ msgstr "未知的版本"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "未知的公钥算法"
 
@@ -8225,9 +8467,6 @@ msgstr "不支持保护散列 %d\n"
 #~ msgid "network error"
 #~ msgstr "网络错误"
 
-#~ msgid "not encrypted"
-#~ msgstr "未被加密"
-
 #~ msgid "not processed"
 #~ msgstr "未被处理"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8f9817d64..3ebc8790b 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: 2007-12-03 15:04+0100\n"
+"POT-Creation-Date: 2007-12-14 16:16+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"
@@ -42,51 +42,51 @@ msgstr "請輸入密語; 這是一個秘密的句子 \n"
 msgid "Quality:"
 msgstr "有效性: %s"
 
-#. TRANSLATORS: This string is a tooltip, shown by pinentry when
-#. hovering over the quality bar.  Please use an appropriate
-#. string to describe what this is about.  The length of the
-#. tooltip is limited to about 900 characters.  If you do not
-#. translate this entry, a default english text (see source)
-#. will be used.
-#: agent/call-pinentry.c:604
+#. TRANSLATORS: This string is a tooltip, shown by pinentry
+#. when hovering over the quality bar.  Please use an
+#. appropriate string to describe what this is about.  The
+#. length of the tooltip is limited to about 900 characters.
+#. If you do not translate this entry, a default english
+#. text (see source) will be used.
+#: agent/call-pinentry.c:609
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:647
+#: agent/call-pinentry.c:651
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:667 agent/call-pinentry.c:679
+#: agent/call-pinentry.c:671 agent/call-pinentry.c:683
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:668
+#: agent/call-pinentry.c:672
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太長"
 
-#: agent/call-pinentry.c:676
+#: agent/call-pinentry.c:680
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有無效的字符\n"
 
-#: agent/call-pinentry.c:681
+#: agent/call-pinentry.c:685
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:693
+#: agent/call-pinentry.c:697
 #, fuzzy
 msgid "Bad PIN"
 msgstr "損壞的 MPI"
 
-#: agent/call-pinentry.c:694
+#: agent/call-pinentry.c:698
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "錯誤的密語"
 
-#: agent/call-pinentry.c:730
+#: agent/call-pinentry.c:734
 #, fuzzy
 msgid "Passphrase"
 msgstr "錯誤的密語"
@@ -96,21 +96,21 @@ msgstr "錯誤的密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3141
-#: g10/keygen.c:3174 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:536
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1056 g10/keygen.c:3155
+#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/command-ssh.c:700 g10/card-util.c:680 g10/card-util.c:749
-#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193 g10/keygen.c:2630
-#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
-#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
-#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1944
-#: sm/gpgsm.c:1981 sm/gpgsm.c:2019 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:680
+#: g10/card-util.c:749 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1057 g10/import.c:193
+#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
+#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:540
+#: g10/tdbio.c:603 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1972
+#: sm/gpgsm.c:2009 sm/gpgsm.c:2047 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -192,8 +192,8 @@ msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: agent/genkey.c:106 sm/export.c:628 sm/export.c:644 sm/import.c:525
-#: sm/import.c:550
+#: agent/genkey.c:106 sm/certreqgen-ui.c:284 sm/export.c:628 sm/export.c:644
+#: sm/import.c:525 sm/import.c:550
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
@@ -272,7 +272,7 @@ msgid "Please enter the new passphrase"
 msgstr "更改密語"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101
+#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -291,13 +291,13 @@ msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:468 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:342 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:343 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:72 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "囉唆模式"
 
 #: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:343
+#: sm/gpgsm.c:344
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
@@ -379,8 +379,8 @@ msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204
+#: scd/scdaemon.c:207 sm/gpgsm.c:572 tools/gpg-connect-agent.c:171
+#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
@@ -396,29 +396,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:732
+#: agent/gpg-agent.c:323 g10/gpg.c:963 scd/scdaemon.c:247 sm/gpgsm.c:734
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:874 sm/gpgsm.c:877 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:997
+#: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:621 g10/gpg.c:1999 scd/scdaemon.c:423 sm/gpgsm.c:965
+#: agent/gpg-agent.c:621 g10/gpg.c:2038 scd/scdaemon.c:423 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2003
-#: scd/scdaemon.c:428 sm/gpgsm.c:969 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2042
+#: scd/scdaemon.c:428 sm/gpgsm.c:973 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:634 g10/gpg.c:2010 scd/scdaemon.c:436 sm/gpgsm.c:976
+#: agent/gpg-agent.c:634 g10/gpg.c:2049 scd/scdaemon.c:436 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
@@ -530,12 +531,12 @@ msgstr "%s: 已跳過: %s\n"
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329
+#: agent/gpg-agent.c:1918 common/simple-pwquery.c:329 common/asshelp.c:324
 #: tools/gpg-connect-agent.c:1953
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341
+#: agent/gpg-agent.c:1931 common/simple-pwquery.c:341 common/asshelp.c:336
 #: tools/gpg-connect-agent.c:1964
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -606,7 +607,7 @@ msgstr "已取消"
 msgid "error opening `%s': %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
 
-#: agent/trustlist.c:147
+#: agent/trustlist.c:147 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "選項檔 `%s': %s\n"
@@ -631,7 +632,7 @@ msgstr "讀取 `%s' 錯誤: %s\n"
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:283
+#: agent/trustlist.c:283 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -856,6 +857,145 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#: common/asshelp.c:242
+msgid "no running gpg-agent - starting one\n"
+msgstr ""
+
+#: common/asshelp.c:347
+msgid "can't connect to the agent - trying fall back\n"
+msgstr ""
+
+#: common/audit.c:682
+#, fuzzy
+msgid "Certificate chain available"
+msgstr "損壞的憑證"
+
+#: common/audit.c:689
+#, fuzzy
+msgid "root certificate missing"
+msgstr "損壞的憑證"
+
+#: common/audit.c:715
+msgid "Data encryption succeeded"
+msgstr ""
+
+#: common/audit.c:720 common/audit.c:781 common/audit.c:801 common/audit.c:825
+#, fuzzy
+msgid "Data available"
+msgstr "列出所有可用的資料"
+
+#: common/audit.c:723
+#, fuzzy
+msgid "Session key created"
+msgstr "%s: 鑰匙圈已建立\n"
+
+#: common/audit.c:728
+#, fuzzy, c-format
+msgid "algorithm: %s"
+msgstr "有效性: %s"
+
+#: common/audit.c:730 common/audit.c:732
+#, fuzzy, c-format
+msgid "unsupported algorithm: %s"
+msgstr ""
+"\n"
+"已被支援的演算法:\n"
+
+#: common/audit.c:734
+#, fuzzy
+msgid "seems to be not encrypted"
+msgstr "未被加密"
+
+#: common/audit.c:740
+#, fuzzy
+msgid "Number of recipients"
+msgstr "目前的收件者:\n"
+
+#: common/audit.c:748
+#, c-format
+msgid "Recipient %d"
+msgstr ""
+
+#: common/audit.c:776
+msgid "Data signing succeeded"
+msgstr ""
+
+#: common/audit.c:796
+msgid "Data decryption succeeded"
+msgstr ""
+
+#: common/audit.c:821
+#, fuzzy
+msgid "Data verification succeeded"
+msgstr "簽章驗證已被抑制\n"
+
+#: common/audit.c:830
+#, fuzzy
+msgid "Signature available"
+msgstr "由 %s 建立的簽章\n"
+
+#: common/audit.c:835
+#, fuzzy
+msgid "Parsing signature succeeded"
+msgstr "完好的簽章來自於 \"%s\""
+
+#: common/audit.c:840
+#, fuzzy, c-format
+msgid "Bad hash algorithm: %s"
+msgstr "無效的 `%s' 雜湊演算法\n"
+
+#: common/audit.c:855
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "由 %s 建立的簽章\n"
+
+#: common/audit.c:871
+#, fuzzy
+msgid "Certificate chain valid"
+msgstr "這把金鑰已經過期了!"
+
+#: common/audit.c:882
+#, fuzzy
+msgid "Root certificate trustworthy"
+msgstr "損壞的憑證"
+
+#: common/audit.c:892
+#, fuzzy
+msgid "CRL/OCSP check of certificates"
+msgstr "損壞的憑證"
+
+#: common/audit.c:909
+#, fuzzy
+msgid "Included certificates"
+msgstr "損壞的憑證"
+
+#: common/audit.c:965
+msgid "No audit log entries."
+msgstr ""
+
+#: common/audit.c:1014
+#, fuzzy
+msgid "Unknown operation"
+msgstr "未知的版本"
+
+#: common/audit.c:1032
+msgid "Gpg-Agent usable"
+msgstr ""
+
+#: common/audit.c:1042
+msgid "Dirmngr usable"
+msgstr ""
+
+#: common/audit.c:1078
+#, fuzzy, c-format
+msgid "No help available for `%s'."
+msgstr "`%s' 沒有可用的說明"
+
+#: common/helpfile.c:80
+#, fuzzy
+msgid "ignoring garbage line"
+msgstr "結尾列有問題\n"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -971,13 +1111,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1394 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2817 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2831 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1127 g10/card-util.c:1206
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1577
-#: g10/keygen.c:1644
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
+#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
 
@@ -1144,7 +1284,7 @@ msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
 #: g10/card-util.c:1138 g10/card-util.c:1217 g10/keyedit.c:945
-#: g10/keygen.c:1581 g10/keygen.c:1609 g10/keygen.c:1683 g10/revoke.c:685
+#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
@@ -1248,18 +1388,18 @@ msgstr "無效的指令  (試試看 \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3858 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3906 g10/keyring.c:376 g10/keyring.c:663
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3401 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2367 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2368 g10/keyserver.c:1733
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1299,7 +1439,7 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:226 g10/sign.c:1266
+#: g10/encode.c:226 g10/sign.c:1268
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
@@ -1318,7 +1458,7 @@ msgstr "正在使用編密法 %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是一個空檔案\n"
@@ -1343,7 +1483,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:655 g10/sign.c:936
+#: g10/encode.c:655 g10/sign.c:938
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1370,17 +1510,17 @@ msgstr "%s/%s 已經加密給: \"%s\"\n"
 msgid "%s encrypted data\n"
 msgstr "%s 加密過的資料\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的演算法 %d 加密過\n"
 
-#: g10/encr-data.c:132 sm/decrypt.c:126
+#: g10/encr-data.c:133 sm/decrypt.c:126
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊息被以對稱式編密法的弱金鑰加密了.\n"
 
-#: g10/encr-data.c:144
+#: g10/encr-data.c:145
 msgid "problem handling encrypted packet\n"
 msgstr "處理加密的封包有問題\n"
 
@@ -1524,7 +1664,7 @@ msgstr ""
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2391 g10/keyedit.c:3726
+#: g10/getkey.c:2391 g10/keyedit.c:3727
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
@@ -1539,7 +1679,7 @@ msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:244 tools/gpgconf.c:56
+#: g10/gpg.c:367 kbx/kbxutil.c:71 sm/gpgsm.c:245 tools/gpgconf.c:56
 msgid ""
 "@Commands:\n"
 " "
@@ -1555,27 +1695,27 @@ msgstr "|[檔案]|建立一份簽章"
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:371 sm/gpgsm.c:248
+#: g10/gpg.c:371 sm/gpgsm.c:249
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:250
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:251
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:376 sm/gpgsm.c:251
+#: g10/gpg.c:376 sm/gpgsm.c:252
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:378 sm/gpgsm.c:252
+#: g10/gpg.c:378 sm/gpgsm.c:253
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:380 sm/gpgsm.c:254
+#: g10/gpg.c:380 sm/gpgsm.c:255
 msgid "list keys"
 msgstr "列出金鑰"
 
@@ -1587,11 +1727,11 @@ msgstr "列出金鑰和簽章"
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:384 sm/gpgsm.c:258
+#: g10/gpg.c:384 sm/gpgsm.c:259
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:385 sm/gpgsm.c:256
+#: g10/gpg.c:385 sm/gpgsm.c:257
 msgid "list secret keys"
 msgstr "列出私鑰"
 
@@ -1627,11 +1767,11 @@ msgstr "產生一份撤銷憑證"
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:396 sm/gpgsm.c:261
+#: g10/gpg.c:396 sm/gpgsm.c:262
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:397 sm/gpgsm.c:262
+#: g10/gpg.c:397 sm/gpgsm.c:263
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
@@ -1667,11 +1807,11 @@ msgstr "更新信任資料庫"
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:429 sm/gpgsm.c:266
+#: g10/gpg.c:429 sm/gpgsm.c:267
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:281
+#: g10/gpg.c:431 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:282
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1682,32 +1822,32 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:433 sm/gpgsm.c:283
+#: g10/gpg.c:433 sm/gpgsm.c:284
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:435 sm/gpgsm.c:295
+#: g10/gpg.c:435 sm/gpgsm.c:296
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:446 sm/gpgsm.c:333
+#: g10/gpg.c:446 sm/gpgsm.c:334
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:447 sm/gpgsm.c:336
+#: g10/gpg.c:447 sm/gpgsm.c:337
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:338
+#: g10/gpg.c:452 sm/gpgsm.c:339
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:466 sm/gpgsm.c:341
+#: g10/gpg.c:466 sm/gpgsm.c:342
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "從 `%s' 讀取選項\n"
 
-#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:352 tools/gpgconf.c:74
+#: g10/gpg.c:479 kbx/kbxutil.c:90 sm/gpgsm.c:353 tools/gpgconf.c:74
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
@@ -1723,7 +1863,7 @@ msgstr "使用嚴謹的 OpenPGP 行為"
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:553 sm/gpgsm.c:400
+#: g10/gpg.c:553 sm/gpgsm.c:402
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1731,7 +1871,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:556 sm/gpgsm.c:403
+#: g10/gpg.c:556 sm/gpgsm.c:405
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1769,7 +1909,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:783 sm/gpgsm.c:583
+#: g10/gpg.c:783 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1789,11 +1929,11 @@ msgstr "編密法: "
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:807 g10/keyedit.c:2365
+#: g10/gpg.c:807 g10/keyedit.c:2366
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:814 sm/gpgsm.c:603
+#: g10/gpg.c:814 sm/gpgsm.c:605
 msgid "Used libraries:"
 msgstr ""
 
@@ -1801,7 +1941,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1092 sm/gpgsm.c:768
+#: g10/gpg.c:1092 sm/gpgsm.c:770
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
@@ -1872,456 +2012,456 @@ msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1492
+#: g10/gpg.c:1528
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1623
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1625
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1591
+#: g10/gpg.c:1627
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1593
+#: g10/gpg.c:1629
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1597
+#: g10/gpg.c:1633
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1599
+#: g10/gpg.c:1635
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1637
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1603
+#: g10/gpg.c:1639
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1605
+#: g10/gpg.c:1641
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1643
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1609
+#: g10/gpg.c:1645
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1802
+#: g10/gpg.c:1838
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:1957
+#: g10/gpg.c:1996
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:2217 g10/gpg.c:2882 g10/gpg.c:2894
+#: g10/gpg.c:2256 g10/gpg.c:2930 g10/gpg.c:2942
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2398 g10/gpg.c:2410
+#: g10/gpg.c:2437 g10/gpg.c:2449
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2531
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2515 g10/gpg.c:2710 g10/keyedit.c:4084
+#: g10/gpg.c:2554 g10/gpg.c:2749 g10/keyedit.c:4085
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2547
+#: g10/gpg.c:2586
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2557
+#: g10/gpg.c:2596
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2570
+#: g10/gpg.c:2609
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2572
+#: g10/gpg.c:2611
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2574
+#: g10/gpg.c:2613
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2580
+#: g10/gpg.c:2619
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2582
+#: g10/gpg.c:2621
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2623
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2586
+#: g10/gpg.c:2625
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2588
+#: g10/gpg.c:2627
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2590
+#: g10/gpg.c:2629
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2597
+#: g10/gpg.c:2636
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2600
+#: g10/gpg.c:2639
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2821
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2785
+#: g10/gpg.c:2824
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2871 sm/gpgsm.c:1361
+#: g10/gpg.c:2919 sm/gpgsm.c:1369
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2875
+#: g10/gpg.c:2923
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2932
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2887
+#: g10/gpg.c:2935
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2902
+#: g10/gpg.c:2950
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2916
+#: g10/gpg.c:2964
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2922
+#: g10/gpg.c:2970
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2928
+#: g10/gpg.c:2976
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2941
+#: g10/gpg.c:2989
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3031 sm/gpgsm.c:1433
+#: g10/gpg.c:3055 g10/gpg.c:3079 sm/gpgsm.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3013 g10/gpg.c:3037 sm/gpgsm.c:1441
+#: g10/gpg.c:3061 g10/gpg.c:3085 sm/gpgsm.c:1449 sm/gpgsm.c:1455
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3019
+#: g10/gpg.c:3067
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3025
+#: g10/gpg.c:3073
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3040
+#: g10/gpg.c:3088
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3042
+#: g10/gpg.c:3090
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3092
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3094
 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:3048
+#: g10/gpg.c:3096
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3051
+#: g10/gpg.c:3099
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3055
+#: g10/gpg.c:3103
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3062
+#: g10/gpg.c:3110
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3071
+#: g10/gpg.c:3119
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3123
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3079
+#: g10/gpg.c:3127
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3160
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3207
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3212
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3169
+#: g10/gpg.c:3217
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3309
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3320
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3341
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3300
+#: g10/gpg.c:3348
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3302
+#: g10/gpg.c:3350
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3312
+#: g10/gpg.c:3360
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3325
+#: g10/gpg.c:3373
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3327
+#: g10/gpg.c:3375
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3378
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3396
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3409
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3424
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3378
+#: g10/gpg.c:3426
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3401
+#: g10/gpg.c:3449
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3458
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3483
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3443
+#: g10/gpg.c:3491
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3447
+#: g10/gpg.c:3495
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3516
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3553
+#: g10/gpg.c:3601
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3603
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3557
+#: g10/gpg.c:3605
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3568
+#: g10/gpg.c:3616
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3578
+#: g10/gpg.c:3626
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3629
+#: g10/gpg.c:3677
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3637
+#: g10/gpg.c:3685
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3727
+#: g10/gpg.c:3775
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3844
+#: g10/gpg.c:3892
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3848
+#: g10/gpg.c:3896
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:4160
+#: g10/gpg.c:4208
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4162
+#: g10/gpg.c:4210
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4195
+#: g10/gpg.c:4243
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -2333,7 +2473,7 @@ msgstr "從這個鑰匙圈裡取用金鑰"
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:375
+#: g10/gpgv.c:75 sm/gpgsm.c:376
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此檔案描述"
 
@@ -2349,321 +2489,11 @@ msgstr ""
 "語法: gpg [選項] [檔案]\n"
 "用已知的受信任金鑰來檢查簽章\n"
 
-#: g10/helptext.c:49
-msgid ""
-"It's up to you to assign a value here; this value will never be exported\n"
-"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
-"to do with the (implicitly created) web-of-certificates."
-msgstr ""
-"在這裡指派的數值完全是看妳自己決定; 這些數值永遠不會被匯出給其他人.\n"
-"我們需要它來實施信任網絡; 這跟 (自動建立起的) 憑證網絡一點關係也沒有."
-
-#: g10/helptext.c:55
-msgid ""
-"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
-"ultimately trusted - those are usually the keys for which you have\n"
-"access to the secret key.  Answer \"yes\" to set this key to\n"
-"ultimately trusted\n"
-msgstr ""
-"要建立起信任網絡, GnuPG 需要知道哪些金鑰是被徹底信任的 -\n"
-"那些金鑰通常就是妳有辦法存取到私鑰的. 回答 \"yes\" 來將這些\n"
-"金鑰設成被徹底信任的\n"
-
-#: g10/helptext.c:62
-msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "如果妳無論如何想要使用這把未被信任的金鑰, 請回答 \"yes\"."
-
-#: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
-msgstr "輸入妳要遞送的訊息接收者的使用者 ID."
-
-#: g10/helptext.c:70
-msgid ""
-"Select the algorithm to use.\n"
-"\n"
-"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
-"for signatures.\n"
-"\n"
-"Elgamal is an encrypt-only algorithm.\n"
-"\n"
-"RSA may be used for signatures or encryption.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing."
-msgstr ""
-"請選擇要使用的演算法.\n"
-"\n"
-"DSA (亦即 DSS) 是數位簽章演算法 (Digital Signature Algorithm),\n"
-"祇能用於簽署.\n"
-"\n"
-"Elgamal 是祇能用於加密的演算法.\n"
-"\n"
-"RSA 可以被用來簽署及加密.\n"
-"\n"
-"第一把 (主要的) 金鑰一定要含有能用於簽署的金鑰."
-
-#: g10/helptext.c:84
-msgid ""
-"In general it is not a good idea to use the same key for signing and\n"
-"encryption.  This algorithm should only be used in certain domains.\n"
-"Please consult your security expert first."
-msgstr ""
-"通常來說用同一把金鑰簽署及加密並不是個好主意.\n"
-"這個演算法應該祇被用於特定的情況下.\n"
-"請先聯絡妳的安全專家."
-
-#: g10/helptext.c:91
-msgid "Enter the size of the key"
-msgstr "請輸入金鑰的尺寸"
-
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
-msgid "Answer \"yes\" or \"no\""
-msgstr "請回答 \"yes\" 或 \"no\""
-
-#: g10/helptext.c:105
-msgid ""
-"Enter the required value as shown in the prompt.\n"
-"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
-"get a good error response - instead the system tries to interpret\n"
-"the given value as an interval."
-msgstr ""
-"請輸入提示裡所要求的數值.\n"
-"妳可以輸入 ISO 日期格式 (YYYY-MM-DD), 但是不會得到良好的錯誤回應 -\n"
-"反之, 系統會試著把給定的數值中斷成若干片段."
-
-#: g10/helptext.c:117
-msgid "Enter the name of the key holder"
-msgstr "請輸入金鑰持有人的名字"
-
-#: g10/helptext.c:122
-msgid "please enter an optional but highly suggested email address"
-msgstr "請輸入選用 (但強烈建議使用) 的電子郵件位址"
-
-#: g10/helptext.c:126
-msgid "Please enter an optional comment"
-msgstr "請輸入選用的註釋"
-
-#: g10/helptext.c:131
-msgid ""
-"N  to change the name.\n"
-"C  to change the comment.\n"
-"E  to change the email address.\n"
-"O  to continue with key generation.\n"
-"Q  to to quit the key generation."
-msgstr ""
-"N  修改姓名.\n"
-"C  修改註釋.\n"
-"E  修改電子郵件位址.\n"
-"O  繼續產生金鑰.\n"
-"Q  中止產生金鑰."
-
-#: g10/helptext.c:140
-msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "如果妳覺得產生子鑰可以的話, 就回答 \"yes\" (或者祇要 \"y\")."
-
-#: g10/helptext.c:148
-msgid ""
-"When you sign a user ID on a key, you should first verify that the key\n"
-"belongs to the person named in the user ID.  It is useful for others to\n"
-"know how carefully you verified this.\n"
-"\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"
-"\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"
-"    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"
-"    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"
-"mean to you when you sign other keys.\n"
-"\n"
-"If you don't know what the right answer is, answer \"0\"."
-msgstr ""
-"當妳在某把金鑰上簽署某個使用者 ID, 妳首先必須先驗證那把\n"
-"金鑰確實屬於那個使用者 ID 上叫那個名字的人. 這對那些知道\n"
-"妳多小心驗證的人來說很有用.\n"
-"\n"
-"\"0\" 表示妳不能提出任何特別的主張來表明\n"
-"    妳多仔細驗證那把金鑰\n"
-"\n"
-"\"1\" 表示妳相信這把金鑰屬於那個主張是主人的人,\n"
-"    但是妳不能或沒有驗證那把金鑰.\n"
-"    這對那些祇想要 \"個人的\" 驗證的人來說很有用,\n"
-"    因為妳簽署了一把擬似匿名使用者的金鑰.\n"
-"\n"
-"\"2\" 表示妳真的仔細驗證了那把金鑰.\n"
-"    例如說, 這能表示妳驗證了這把金鑰的指紋和\n"
-"    使用者 ID, 並比對了照片 ID.\n"
-"\n"
-"\"3\" 表示妳真的做了大規模的驗證金鑰工作.\n"
-"    例如說, 這能表示妳向金鑰持有人驗證了金鑰指紋,\n"
-"    而且妳透過附帶照片而難以偽造的文件 (像是護照)\n"
-"    確認了金鑰持有人的姓名與金鑰上使用者 ID 的一致,\n"
-"    最後妳還 (透過電子郵件往來) 驗證了金鑰上的\n"
-"    電子郵件位址確實屬於金鑰持有人.\n"
-"\n"
-"請注意上述關於等級 2 和 3 的例子 \"祇是\" 例子而已.\n"
-"最後, 還是得由妳自己決定當妳簽署其他金鑰時,\n"
-"甚麼是 \"漫不經心\", 而甚麼是 \"超級謹慎\".\n"
-"\n"
-"如果妳不知道應該選甚麼答案的話, 就選 \"0\"."
-
-#: g10/helptext.c:186
-msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "如果妳想要簽署 *所有* 使用者 ID 的話就回答 \"yes\""
-
-#: g10/helptext.c:190
-msgid ""
-"Answer \"yes\" if you really want to delete this user ID.\n"
-"All certificates are then also lost!"
-msgstr ""
-"如果妳真的想要刪除這個使用者 ID 的話就回答 \"yes\".\n"
-"所有的憑證在那之後也都會失去!"
-
-#: g10/helptext.c:195
-msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "如果刪除這把子鑰沒問題的話就回答 \"yes\""
-
-#: g10/helptext.c:200
-msgid ""
-"This is a valid signature on the key; you normally don't want\n"
-"to delete this signature because it may be important to establish a\n"
-"trust connection to the key or another key certified by this key."
-msgstr ""
-"這是一份在這把金鑰上有效的簽章; 通常妳不會想要刪除這份簽章,\n"
-"因為要跟別的金鑰建立起信任連結, 或由這把金鑰所簽署的金鑰憑證\n"
-"會是一件相當重要的事."
-
-#: g10/helptext.c:205
-msgid ""
-"This signature can't be checked because you don't have the\n"
-"corresponding key.  You should postpone its deletion until you\n"
-"know which key was used because this signing key might establish\n"
-"a trust connection through another already certified key."
-msgstr ""
-"這份簽章無法被檢驗, 因為妳沒有符合的金鑰. 妳應該延緩刪除它,\n"
-"直到妳知道哪一把金鑰被使用了; 因為這把來簽署的金鑰可能透過\n"
-"其他已經驗證的金鑰建立了一個信任連結."
-
-#: g10/helptext.c:211
-msgid ""
-"The signature is not valid.  It does make sense to remove it from\n"
-"your keyring."
-msgstr "這份簽章無效. 把它從妳的鑰匙圈裡移去相當合理."
-
-#: g10/helptext.c:215
-msgid ""
-"This is a signature which binds the user ID to the key. It is\n"
-"usually not a good idea to remove such a signature.  Actually\n"
-"GnuPG might not be able to use this key anymore.  So do this\n"
-"only if this self-signature is for some reason not valid and\n"
-"a second one is available."
-msgstr ""
-"這是一份和這個金鑰使用者 ID 相繫的簽章. 通常\n"
-"把這樣的簽章移除不會是個好點子. 事實上 GnuPG\n"
-"可能從此就不能再使用這把金鑰了. 所以祇有在這\n"
-"把金鑰的第一個自我簽章因某些原因無效, 而第二\n"
-"個還可用的情況下纔這麼做."
-
-#: g10/helptext.c:223
-msgid ""
-"Change the preferences of all user IDs (or just of the selected ones)\n"
-"to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures will be advanced by one second.\n"
-msgstr ""
-"變更所有 (或祇有被選取的那幾個) 使用者 ID 的偏好成現用的偏好清單.\n"
-"所有受到影響的自我簽章的時間戳記都會增加一秒鐘.\n"
-
-#: g10/helptext.c:230
-msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "請輸入密語; 這是一個秘密的句子 \n"
-
-#: g10/helptext.c:236
-msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "請再次輸入最後的密語, 以確定妳到底鍵進了些甚麼."
-
-#: g10/helptext.c:240
-msgid "Give the name of the file to which the signature applies"
-msgstr "請給定簽章所要套用的檔案名稱"
-
-#: g10/helptext.c:245
-msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "如果覆寫這個檔案沒有問題的話就回答 \"yes\""
-
-#: g10/helptext.c:250
-msgid ""
-"Please enter a new filename. If you just hit RETURN the default\n"
-"file (which is shown in brackets) will be used."
-msgstr ""
-"請輸入一個新的檔名. 如果妳直接按下了 Enter, 那麼\n"
-"就會使用預設的檔案 (顯示在括號中)."
-
-#: g10/helptext.c:256
-msgid ""
-"You should specify a reason for the certification.  Depending on the\n"
-"context you have the ability to choose from this list:\n"
-"  \"Key has been compromised\"\n"
-"      Use this if you have a reason to believe that unauthorized persons\n"
-"      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
-"      Use this if you have replaced this key with a newer one.\n"
-"  \"Key is no longer used\"\n"
-"      Use this if you have retired this key.\n"
-"  \"User ID is no longer valid\"\n"
-"      Use this to state that the user ID should not longer be used;\n"
-"      this is normally used to mark an email address invalid.\n"
-msgstr ""
-"妳應該為這份憑證指定一個原因.\n"
-"根據情境的不同, 妳應該可以從這個清單中選出一項:\n"
-"  \"金鑰已經被洩漏了\"\n"
-"      如果妳相信有某個未經許可的傢伙取得了妳的私鑰的話,\n"
-"      就選這個.\n"
-"  \"金鑰被代換了\"\n"
-"      如果妳把妳的金鑰換成新的了, 就選這個.\n"
-"  \"金鑰不再被使用了\"\n"
-"      如果妳已經撤回了這把金鑰, 就選這個.\n"
-"  \"使用者 ID 不再有效了\"\n"
-"      如果這個使用者 ID 不再被使用了, 就選這個;\n"
-"      這通常用來表示某個電子郵件位址不再有效了.\n"
-
-#: g10/helptext.c:272
-msgid ""
-"If you like, you can enter a text describing why you issue this\n"
-"revocation certificate.  Please keep this text concise.\n"
-"An empty line ends the text.\n"
-msgstr ""
-"妳也可以輸入一串文字來描述為甚麼發佈這份撤銷憑證的理由.\n"
-"請讓這段文字保持簡明扼要.\n"
-"鍵入空白列以結束這段文字.\n"
-
-#: g10/helptext.c:287
+#: g10/helptext.c:72
 msgid "No help available"
 msgstr "沒有可用的說明"
 
-#: g10/helptext.c:295
+#: g10/helptext.c:82
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' 沒有可用的說明"
@@ -2858,13 +2688,13 @@ msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
+#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
 
 #: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2381 g10/import.c:2403
+#: g10/import.c:2382 g10/import.c:2404
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
@@ -2953,7 +2783,7 @@ msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
 msgid "importing secret keys not allowed\n"
 msgstr "未被允許匯入私鑰\n"
 
-#: g10/import.c:1158 g10/import.c:2396
+#: g10/import.c:1158 g10/import.c:2397
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
@@ -3405,8 +3235,8 @@ msgstr "我非常小心地檢查過這把金鑰了.\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958
-#: g10/keyedit.c:5019 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
+#: g10/keyedit.c:5020 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
@@ -3415,19 +3245,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:1142 g10/keygen.c:3516
+#: g10/keyedit.c:1142 g10/keygen.c:3530
 msgid "This key is not protected.\n"
 msgstr "這把金鑰沒有被保護.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3503 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分沒辦法取用.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3519
+#: g10/keyedit.c:1150 g10/keygen.c:3533
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上 (on-card).\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3523
+#: g10/keyedit.c:1154 g10/keygen.c:3537
 msgid "Key is protected.\n"
 msgstr "金鑰被保護了.\n"
 
@@ -3444,7 +3274,7 @@ msgstr ""
 "輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2116
+#: g10/keyedit.c:1199 g10/keygen.c:2130
 msgid "passphrase not correctly repeated; try again"
 msgstr "密語再次輸入時沒有正確重複; 請再試一次"
 
@@ -3776,23 +3606,23 @@ msgstr "更新私鑰失敗: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2344
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2395
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2406
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2420 g10/keylist.c:306
+#: g10/keyedit.c:2421 g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2428 g10/keyedit.c:2429
+#: g10/keyedit.c:2429 g10/keyedit.c:2430
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3800,73 +3630,73 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/keyedit.c:2639
+#: g10/keyedit.c:2640
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好.\n"
 
-#: g10/keyedit.c:2698
+#: g10/keyedit.c:2699
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 給撤銷了\n"
 
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2720
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2726
 msgid "(sensitive)"
 msgstr "(機密的)"
 
-#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
+#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
 #: g10/keylist.c:192 g10/keyserver.c:521
 #, c-format
 msgid "created: %s"
 msgstr "建立於: %s"
 
-#: g10/keyedit.c:2744 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:983
+#: g10/keyedit.c:2745 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "已撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2746 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2747 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "已過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
 #: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:989
+#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "過期: %s"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2751
 #, c-format
 msgid "usage: %s"
 msgstr "用法: %s"
 
-#: g10/keyedit.c:2765
+#: g10/keyedit.c:2766
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2769
+#: g10/keyedit.c:2770
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2777
 msgid "This key has been disabled"
 msgstr "這把金鑰已經被禁用了"
 
-#: g10/keyedit.c:2804 g10/keylist.c:198
+#: g10/keyedit.c:2805 g10/keylist.c:198
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2828
+#: g10/keyedit.c:2829
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3874,17 +3704,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:531
-#: g10/mainproc.c:1835 g10/trustdb.c:1173 g10/trustdb.c:1693
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:535
-#: g10/mainproc.c:1837 g10/trustdb.c:526 g10/trustdb.c:1695
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2960
 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"
@@ -3892,7 +3722,7 @@ msgstr ""
 "警告: 沒有任何使用者 ID 已被標示為主要 ID. 這項指令可能\n"
 "      會導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:3020
+#: g10/keyedit.c:3021
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3901,74 +3731,74 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3025 g10/keyedit.c:3360
+#: g10/keyedit.c:3026 g10/keyedit.c:3361
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3032
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3171
+#: g10/keyedit.c:3172
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這個完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3182
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這個無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3186
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這個未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3191
+#: g10/keyedit.c:3192
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這個自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3206
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3207
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3210
 msgid "Nothing deleted.\n"
 msgstr "沒有東西被刪除.\n"
 
-#: g10/keyedit.c:3242 g10/trustdb.c:1697
+#: g10/keyedit.c:3243 g10/trustdb.c:1697
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:3244
+#: g10/keyedit.c:3245
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3251
+#: g10/keyedit.c:3252
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3253
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3261
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3262
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3356
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3977,192 +3807,192 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3366
+#: g10/keyedit.c:3367
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3386
+#: g10/keyedit.c:3387
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3411
+#: g10/keyedit.c:3412
 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:3426
+#: g10/keyedit.c:3427
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3448
+#: g10/keyedit.c:3449
 msgid "this key has already been designated as a revoker\n"
 msgstr "這把金鑰已被指定為撤銷者了\n"
 
-#: g10/keyedit.c:3467
+#: g10/keyedit.c:3468
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3474
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3534
+#: g10/keyedit.c:3535
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3540
+#: g10/keyedit.c:3541
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把次鑰.\n"
 
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3545
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更某把次鑰的使用期限.\n"
 
-#: g10/keyedit.c:3547
+#: g10/keyedit.c:3548
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3593
+#: g10/keyedit.c:3594
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3609
+#: g10/keyedit.c:3610
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3687
+#: g10/keyedit.c:3688
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
 
-#: g10/keyedit.c:3693
+#: g10/keyedit.c:3694
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3856
+#: g10/keyedit.c:3857
 msgid "Please select exactly one user ID.\n"
 msgstr "請精確地選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266
+#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:4066
+#: g10/keyedit.c:4067
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4146
+#: g10/keyedit.c:4147
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4148
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4209
+#: g10/keyedit.c:4210
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "簽章標記: "
 
-#: g10/keyedit.c:4358
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "是否覆寫? (y/N) "
 
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4423
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4480
+#: g10/keyedit.c:4481
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4507
+#: g10/keyedit.c:4508
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到次鑰\n"
 
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4643
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4645 g10/keyedit.c:4709 g10/keyedit.c:4752
+#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
 
-#: g10/keyedit.c:4647 g10/keyedit.c:4711 g10/keyedit.c:4754
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4652
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽署已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4655
+#: g10/keyedit.c:4656
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4659
+#: g10/keyedit.c:4660
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4686
+#: g10/keyedit.c:4687
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4712
+#: g10/keyedit.c:4713
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4720
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4742
 msgid "You are about to revoke these signatures:\n"
 msgstr "妳正在撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4761
+#: g10/keyedit.c:4762
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4862
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4878
+#: g10/keyedit.c:4879
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4942
+#: g10/keyedit.c:4943
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:5004
+#: g10/keyedit.c:5005
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "次鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:5099
+#: g10/keyedit.c:5100
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -4202,12 +4032,12 @@ msgid "writing key binding signature\n"
 msgstr "正在寫入附鑰簽章\n"
 
 #: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3016
+#: g10/keygen.c:3030
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3022
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3036
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
@@ -4233,109 +4063,119 @@ msgstr "加密"
 msgid "Authenticate"
 msgstr "鑑定"
 
-#: g10/keygen.c:1536
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation.  If this is not possible use single digits.  The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1546
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1555
+#: g10/keygen.c:1569
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 金鑰可能的動作: "
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1573
 msgid "Current allowed actions: "
 msgstr "目前可進行的動作: "
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1578
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 切換簽署性能\n"
 
-#: g10/keygen.c:1567
+#: g10/keygen.c:1581
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 切換加密性能\n"
 
-#: g10/keygen.c:1570
+#: g10/keygen.c:1584
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 切換鑑定性能\n"
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1587
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1629
+#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇妳要使用的金鑰種類:\n"
 
-#: g10/keygen.c:1631
+#: g10/keygen.c:1645
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 Elgamal (預設)\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1648
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1636
+#: g10/keygen.c:1650
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (僅能加密用)\n"
 
-#: g10/keygen.c:1637
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (僅能簽署用)\n"
 
-#: g10/keygen.c:1639
+#: g10/keygen.c:1653
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (僅能加密用)\n"
 
-#: g10/keygen.c:1641
+#: g10/keygen.c:1655
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (妳自己設定性能)\n"
 
-#: g10/keygen.c:1710
+#: g10/keygen.c:1724
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 金鑰對會有 %u 位元長.\n"
 
-#: g10/keygen.c:1720
+#: g10/keygen.c:1734
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "妳想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1741
+#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 
-#: g10/keygen.c:1747
+#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "妳所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:1752 g10/keygen.c:1757
+#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:1826
+#: g10/keygen.c:1840
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4351,7 +4191,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會過期\n"
 "      <n>y = 金鑰在 n 年後會過期\n"
 
-#: g10/keygen.c:1837
+#: g10/keygen.c:1851
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4367,38 +4207,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會過期\n"
 "      <n>y = 簽章在 n 年後會過期\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1874
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:1865
+#: g10/keygen.c:1879
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1897
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:1890
+#: g10/keygen.c:1904
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:1891
+#: g10/keygen.c:1905
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:1896
+#: g10/keygen.c:1910
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 過期\n"
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1911
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 過期.\n"
 
-#: g10/keygen.c:1901
+#: g10/keygen.c:1915
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4406,11 +4246,11 @@ msgstr ""
 "妳的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1922
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1931
+#: g10/keygen.c:1945
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4425,44 +4265,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1944
+#: g10/keygen.c:1958
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1966
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:1954
+#: g10/keygen.c:1968
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1970
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:1964
+#: g10/keygen.c:1978
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1984
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1992
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1998
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:2006
+#: g10/keygen.c:2020
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "妳正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:2012
+#: g10/keygen.c:2026
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4473,7 +4313,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2031
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 
@@ -4488,23 +4328,23 @@ msgstr "請不要把電子郵件地址放進妳的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2033
+#: g10/keygen.c:2047
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2043
+#: g10/keygen.c:2057
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:2044
+#: g10/keygen.c:2058
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2077
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:2102
+#: g10/keygen.c:2116
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4512,12 +4352,12 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:2117
+#: g10/keygen.c:2131
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2137
 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"
@@ -4529,7 +4369,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2161
 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"
@@ -4540,50 +4380,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:2956 g10/keygen.c:2983
+#: g10/keygen.c:2970 g10/keygen.c:2997
 msgid "Key generation canceled.\n"
 msgstr "已取消金鑰產生.\n"
 
-#: g10/keygen.c:3188 g10/keygen.c:3355
+#: g10/keygen.c:3202 g10/keygen.c:3369
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在將公鑰寫至 `%s'\n"
 
-#: g10/keygen.c:3190 g10/keygen.c:3358
+#: g10/keygen.c:3204 g10/keygen.c:3372
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:3193 g10/keygen.c:3361
+#: g10/keygen.c:3207 g10/keygen.c:3375
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在將私鑰寫至 `%s'\n"
 
-#: g10/keygen.c:3342
+#: g10/keygen.c:3356
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3349
+#: g10/keygen.c:3363
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3369
+#: g10/keygen.c:3383
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3377
+#: g10/keygen.c:3391
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/keygen.c:3404
+#: g10/keygen.c:3418
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已經被建立及簽署了.\n"
 
-#: g10/keygen.c:3415
+#: g10/keygen.c:3429
 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"
@@ -4591,42 +4431,42 @@ msgstr ""
 "請注意這把金鑰不能用於加密之用.  也許妳會想藉由 \"--edit-key\" \n"
 "指令來產生加密用的次鑰.\n"
 
-#: g10/keygen.c:3428 g10/keygen.c:3573 g10/keygen.c:3694
+#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3483 g10/keygen.c:3624 g10/sign.c:241
+#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3485 g10/keygen.c:3626 g10/sign.c:243
+#: g10/keygen.c:3499 g10/keygen.c:3640 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3496 g10/keygen.c:3637
+#: g10/keygen.c:3510 g10/keygen.c:3651
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3537 g10/keygen.c:3670
+#: g10/keygen.c:3551 g10/keygen.c:3684
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3843
+#: g10/keygen.c:3857
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3891
+#: g10/keygen.c:3905
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3917
+#: g10/keygen.c:3931
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -4924,191 +4764,191 @@ msgstr "密語係以未知的摘要演算法 %d 所產生\n"
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:423
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:456
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 加密了\n"
 
-#: g10/mainproc.c:454 g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:464
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 加密了\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:478
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:486
+#: g10/mainproc.c:492
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:488
+#: g10/mainproc.c:494
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:520 g10/mainproc.c:542
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:528
+#: g10/mainproc.c:534
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:565
+#: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:578
+#: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:584
+#: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:611
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 
-#: g10/mainproc.c:607
+#: g10/mainproc.c:613
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:695
+#: g10/mainproc.c:701
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:836
+#: g10/mainproc.c:842
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1189 g10/mainproc.c:1226
+#: g10/mainproc.c:1195 g10/mainproc.c:1232
 #, fuzzy
 msgid "no signature found\n"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1470
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已被抑制\n"
 
-#: g10/mainproc.c:1573
+#: g10/mainproc.c:1579
 #, fuzzy
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處理這些多重簽章\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1590
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1595
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1615
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1744 g10/mainproc.c:1792
+#: g10/mainproc.c:1750 g10/mainproc.c:1798
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1746 g10/mainproc.c:1794
+#: g10/mainproc.c:1752 g10/mainproc.c:1800
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1796
+#: g10/mainproc.c:1802
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1834
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1926
+#: g10/mainproc.c:1932
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署在 %s 過期\n"
 
-#: g10/mainproc.c:1934
+#: g10/mainproc.c:1940
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1935
+#: g10/mainproc.c:1941
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1936
+#: g10/mainproc.c:1942
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1936 g10/trustdb.c:525
+#: g10/mainproc.c:1942 g10/trustdb.c:525
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1956
+#: g10/mainproc.c:1962
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2040 g10/mainproc.c:2056 g10/mainproc.c:2152
+#: g10/mainproc.c:2046 g10/mainproc.c:2062 g10/mainproc.c:2158
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:2083
+#: g10/mainproc.c:2089
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:2091
+#: g10/mainproc.c:2097
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2156
+#: g10/mainproc.c:2162
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2172
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
@@ -5127,80 +4967,85 @@ msgstr "fstat(%d) 失敗於 %s: %s\n"
 msgid "WARNING: using experimental public key algorithm %s\n"
 msgstr "警告: 正在使用實驗性的公鑰演算法 %s\n"
 
-#: g10/misc.c:303
+#: g10/misc.c:294
+#, fuzzy
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "警告: 摘要演算法 %s 已不建議使用\n"
+
+#: g10/misc.c:307
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr "警告: 正在使用實驗性的編密演算法 %s\n"
 
-#: g10/misc.c:318
+#: g10/misc.c:322
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
 msgstr "警告: 正在使用實驗性的摘要演算法 %s\n"
 
-#: g10/misc.c:323
+#: g10/misc.c:327
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告: 摘要演算法 %s 已不建議使用\n"
 
-#: g10/misc.c:416
+#: g10/misc.c:479
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:417 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
-#: g10/misc.c:652
+#: g10/misc.c:715
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:656
+#: g10/misc.c:719
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:658
+#: g10/misc.c:721
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:665
+#: g10/misc.c:728
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個被反對使用的指令 - 別再用了\n"
 
-#: g10/misc.c:675
+#: g10/misc.c:738
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:678
+#: g10/misc.c:741
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告: \"%s\" 選項已不建議使用\n"
 
-#: g10/misc.c:739
+#: g10/misc.c:802
 msgid "Uncompressed"
 msgstr "未被壓縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:764
+#: g10/misc.c:827
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未被壓縮|無"
 
-#: g10/misc.c:891
+#: g10/misc.c:954
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1066
+#: g10/misc.c:1129
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的選項 `%s'\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1154
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的選項 `%s'\n"
@@ -5940,25 +5785,25 @@ msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:758
+#: g10/sign.c:760
 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:834
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:961
+#: g10/sign.c:963
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1076
+#: g10/sign.c:1078
 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:1260
+#: g10/sign.c:1262
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
@@ -6274,7 +6119,7 @@ msgstr "徹底"
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:577 g10/trustdb.c:2346
+#: g10/trustdb.c:577 g10/trustdb.c:2423
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
@@ -6302,32 +6147,32 @@ msgstr "請做一次 --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:2089
+#: g10/trustdb.c:2166
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2154
+#: g10/trustdb.c:2231
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2168
+#: g10/trustdb.c:2245
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "徹底信任金鑰 %s 的公鑰沒有被找到\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2268
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
 
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2354
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2352
+#: g10/trustdb.c:2429
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@ -6466,12 +6311,12 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328
+#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
 msgid "||Please enter your PIN at the reader's keypad"
 msgstr ""
 
 #: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1483
+#: scd/app-openpgp.c:1483 scd/app-dinsig.c:301
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "個人識別碼 (PIN) 收回時傳回錯誤: %s\n"
@@ -6532,11 +6377,11 @@ msgstr "驗證 CHV %d 失敗: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "取用管理者指令尚未被組態過\n"
 
-#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:1462 scd/app-openpgp.c:2569
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2537
+#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2578
 msgid "card is permanently locked!\n"
 msgstr "卡片已被永久鎖住了!!\n"
 
@@ -6643,12 +6488,12 @@ msgstr "%s 簽章, 摘要演算法 %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2583
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止了\n"
 
-#: scd/app-openpgp.c:2615 scd/app-openpgp.c:2625
+#: scd/app-openpgp.c:2656 scd/app-openpgp.c:2666
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -6657,7 +6502,7 @@ msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:364
+#: scd/scdaemon.c:111 sm/gpgsm.c:365
 #, fuzzy
 msgid "read options from file"
 msgstr "從 `%s' 讀取選項\n"
@@ -6717,22 +6562,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "無效的 64 進位字符 %02x 被跳過了\n"
 
-#: sm/call-dirmngr.c:187
+#: sm/call-dirmngr.c:209
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:220
+#: sm/call-dirmngr.c:242
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: sm/call-dirmngr.c:232
+#: sm/call-dirmngr.c:254
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
-#: sm/call-dirmngr.c:252
+#: sm/call-dirmngr.c:274
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6741,11 +6586,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:195 sm/certchain.c:1646
+#: sm/certchain.c:195 sm/certchain.c:1648
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:196 sm/certchain.c:1646
+#: sm/certchain.c:196 sm/certchain.c:1648
 msgid "shell"
 msgstr ""
 
@@ -6785,8 +6630,8 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1674 sm/decrypt.c:259
-#: sm/encrypt.c:341 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:651 sm/certchain.c:1069 sm/certchain.c:1676 sm/decrypt.c:259
+#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "存放金鑰失敗: %s\n"
@@ -6920,61 +6765,61 @@ msgstr ""
 msgid "no issuer found in certificate"
 msgstr "產生一份撤銷憑證"
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1186
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1253
+#: sm/certchain.c:1255
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1266
+#: sm/certchain.c:1268
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/certchain.c:1295 sm/import.c:158
+#: sm/certchain.c:1297 sm/import.c:158
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1307
+#: sm/certchain.c:1309
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1340
+#: sm/certchain.c:1342
 #, fuzzy
 msgid "certificate has a BAD signature"
 msgstr "驗證某份簽章"
 
-#: sm/certchain.c:1371
+#: sm/certchain.c:1373
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1424
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1462 sm/certchain.c:1745
+#: sm/certchain.c:1464 sm/certchain.c:1747
 #, fuzzy
 msgid "certificate is good\n"
 msgstr "偏好設定 `%s' 重複了\n"
 
-#: sm/certchain.c:1463
+#: sm/certchain.c:1465
 #, fuzzy
 msgid "intermediate certificate is good\n"
 msgstr "已建立撤銷憑證.\n"
 
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
 #, fuzzy
 msgid "root certificate is good\n"
 msgstr "損壞的憑證"
 
-#: sm/certchain.c:1635
+#: sm/certchain.c:1637
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:1644
+#: sm/certchain.c:1646
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -6989,7 +6834,7 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:198
+#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -7110,6 +6955,112 @@ msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
 msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "產生金鑰失敗: %s\n"
 
+#: sm/certreqgen-ui.c:122
+#, fuzzy, c-format
+msgid "   (%d) RSA\n"
+msgstr "   (%d) RSA (僅能簽署用)\n"
+
+#: sm/certreqgen-ui.c:123
+#, fuzzy, c-format
+msgid "   (%d) Existing key\n"
+msgstr "   (2) 加密用金鑰\n"
+
+#: sm/certreqgen-ui.c:124
+#, c-format
+msgid "   (%d) Existing key from card\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:176
+#, fuzzy, c-format
+msgid "Possible actions for a %s key:\n"
+msgstr "%s 金鑰可能的動作: "
+
+#: sm/certreqgen-ui.c:177
+#, fuzzy, c-format
+msgid "   (%d) sign, encrypt\n"
+msgstr "   (%d) DSA (僅能簽署用)\n"
+
+#: sm/certreqgen-ui.c:178
+#, fuzzy, c-format
+msgid "   (%d) sign\n"
+msgstr "   (%d) DSA (僅能簽署用)\n"
+
+#: sm/certreqgen-ui.c:179
+#, fuzzy, c-format
+msgid "   (%d) encrypt\n"
+msgstr "   (%d) RSA (僅能加密用)\n"
+
+#: sm/certreqgen-ui.c:203
+msgid "Enter the X.509 subject name: "
+msgstr ""
+
+#: sm/certreqgen-ui.c:207
+#, fuzzy
+msgid "No subject name given\n"
+msgstr "(沒有給定描述)\n"
+
+#: sm/certreqgen-ui.c:211
+#, c-format
+msgid "Invalid subject name label `%.*s'\n"
+msgstr ""
+
+#. TRANSLATORS: The 22 in the second string is the
+#. length of the first string up to the "%s".  Please
+#. adjust it do the length of your translation.  The
+#. second string is merely passed to atoi so you can
+#. drop everything after the number.
+#: sm/certreqgen-ui.c:220
+#, fuzzy, c-format
+msgid "Invalid subject name `%s'\n"
+msgstr "無效的 `%s' 雜湊演算法\n"
+
+#: sm/certreqgen-ui.c:222
+msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
+msgstr ""
+
+#: sm/certreqgen-ui.c:234
+#, fuzzy
+msgid "Enter email addresses"
+msgstr "電子郵件地址: "
+
+#: sm/certreqgen-ui.c:235
+#, fuzzy
+msgid " (end with an empty line):\n"
+msgstr ""
+"\n"
+"輸入使用者 ID. 以空白列結束: "
+
+#: sm/certreqgen-ui.c:239
+#, fuzzy
+msgid "Enter DNS names"
+msgstr "請輸入新的檔名"
+
+#: sm/certreqgen-ui.c:240 sm/certreqgen-ui.c:245
+#, fuzzy
+msgid " (optional; end with an empty line):\n"
+msgstr "請輸入選用的描述; 以空白列結束:\n"
+
+#: sm/certreqgen-ui.c:244
+#, fuzzy
+msgid "Enter URIs"
+msgstr "請輸入個人識別碼 (PIN): "
+
+#: sm/certreqgen-ui.c:271
+msgid "Parameters to be used for the certificate request:\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:289
+msgid "Now creating certificate request.  This may take a while ...\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:298
+msgid "Ready.  You should now send this request to your CA.\n"
+msgstr ""
+
+#: sm/certreqgen-ui.c:303
+msgid "resource problem: out or core\n"
+msgstr ""
+
 #: sm/decrypt.c:324
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
@@ -7143,204 +7094,204 @@ msgstr "偏好設定 `%s' 重複了\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "刪除金鑰區塊時失敗了: %s\n"
 
-#: sm/encrypt.c:332
+#: sm/encrypt.c:335
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(沒有給定描述)\n"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 #, fuzzy
 msgid "|[FILE]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 #, fuzzy
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:256
 #, fuzzy
 msgid "list external keys"
 msgstr "列出私鑰"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:258
 #, fuzzy
 msgid "list certificate chain"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:261
 #, fuzzy
 msgid "remove key from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 #, fuzzy
 msgid "import certificates"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:265
 #, fuzzy
 msgid "export certificates"
 msgstr "損壞的憑證"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 #, fuzzy
 msgid "register a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:271
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:286
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: sm/gpgsm.c:289
+#: sm/gpgsm.c:290
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:292
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:294
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:299
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:300
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:307
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:312
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:315
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:318
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:326
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "use the default key as default recipient"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:346
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:348
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "從 `%s' 讀取選項\n"
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:350
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "檢查簽章"
 
-#: sm/gpgsm.c:350
+#: sm/gpgsm.c:351
 msgid "always use a MDC for encryption"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:356
+#: sm/gpgsm.c:357
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:358
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:360
 #, fuzzy
 msgid "add this keyring to the list of keyrings"
 msgstr "從這個鑰匙圈裡取用金鑰"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:361
 #, fuzzy
 msgid "add this secret keyring to the list"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: sm/gpgsm.c:361 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
+#: sm/gpgsm.c:362 tools/gpgconf-comp.c:645 tools/gpgconf-comp.c:707
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:363
+#: sm/gpgsm.c:364
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: sm/gpgsm.c:367
+#: sm/gpgsm.c:368
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:383
 msgid "|FILE|load extension module FILE"
 msgstr ""
 
-#: sm/gpgsm.c:388
+#: sm/gpgsm.c:389
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "未知的編密演算法"
 
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:391
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:394
 #, fuzzy
 msgid "|N|use compress algorithm N"
 msgstr "未知的壓縮演算法"
 
-#: sm/gpgsm.c:573
+#: sm/gpgsm.c:575
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:576
+#: sm/gpgsm.c:578
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7351,36 +7302,36 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: sm/gpgsm.c:703
+#: sm/gpgsm.c:705
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法: gpg [選項] "
 
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:803
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: sm/gpgsm.c:812
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "未知的選項 `%s'\n"
 
-#: sm/gpgsm.c:1378
+#: sm/gpgsm.c:1386
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1474
+#: sm/gpgsm.c:1488
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1492
+#: sm/gpgsm.c:1526
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法存取 `%s': %s\n"
 
-#: sm/gpgsm.c:1691
+#: sm/gpgsm.c:1710
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
@@ -7487,7 +7438,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:209 sm/verify.c:580
+#: sm/qualified.c:209 sm/verify.c:604
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
 "signatures.\n"
@@ -7506,31 +7457,31 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 
-#: sm/verify.c:424
+#: sm/verify.c:447
 #, fuzzy
 msgid "Signature made "
 msgstr "由 %s 建立的簽章\n"
 
-#: sm/verify.c:428
+#: sm/verify.c:451
 msgid "[date not given]"
 msgstr ""
 
-#: sm/verify.c:429
+#: sm/verify.c:452
 #, fuzzy, c-format
 msgid " using certificate ID 0x%08lX\n"
 msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
 
-#: sm/verify.c:558
+#: sm/verify.c:582
 #, fuzzy
 msgid "Good signature from"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: sm/verify.c:559
+#: sm/verify.c:583
 #, fuzzy
 msgid "                aka"
 msgstr "                亦即 \"%s\""
 
-#: sm/verify.c:577
+#: sm/verify.c:601
 #, fuzzy
 msgid "This is a qualified signature\n"
 msgstr "這將會是一份自我簽章.\n"
@@ -7987,6 +7938,303 @@ msgstr ""
 msgid "class %s is not supported\n"
 msgstr "保護摘要 %d 未被支援\n"
 
+#: tools/gpg-check-pattern.c:145
+#, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
+
+#: tools/gpg-check-pattern.c:148
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+
+#~ msgid ""
+#~ "It's up to you to assign a value here; this value will never be exported\n"
+#~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
+#~ "nothing\n"
+#~ "to do with the (implicitly created) web-of-certificates."
+#~ msgstr ""
+#~ "在這裡指派的數值完全是看妳自己決定; 這些數值永遠不會被匯出給其他人.\n"
+#~ "我們需要它來實施信任網絡; 這跟 (自動建立起的) 憑證網絡一點關係也沒有."
+
+#~ msgid ""
+#~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+#~ "ultimately trusted - those are usually the keys for which you have\n"
+#~ "access to the secret key.  Answer \"yes\" to set this key to\n"
+#~ "ultimately trusted\n"
+#~ msgstr ""
+#~ "要建立起信任網絡, GnuPG 需要知道哪些金鑰是被徹底信任的 -\n"
+#~ "那些金鑰通常就是妳有辦法存取到私鑰的. 回答 \"yes\" 來將這些\n"
+#~ "金鑰設成被徹底信任的\n"
+
+#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+#~ msgstr "如果妳無論如何想要使用這把未被信任的金鑰, 請回答 \"yes\"."
+
+#~ msgid ""
+#~ "Enter the user ID of the addressee to whom you want to send the message."
+#~ msgstr "輸入妳要遞送的訊息接收者的使用者 ID."
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+#~ "for signatures.\n"
+#~ "\n"
+#~ "Elgamal is an encrypt-only algorithm.\n"
+#~ "\n"
+#~ "RSA may be used for signatures or encryption.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of signing."
+#~ msgstr ""
+#~ "請選擇要使用的演算法.\n"
+#~ "\n"
+#~ "DSA (亦即 DSS) 是數位簽章演算法 (Digital Signature Algorithm),\n"
+#~ "祇能用於簽署.\n"
+#~ "\n"
+#~ "Elgamal 是祇能用於加密的演算法.\n"
+#~ "\n"
+#~ "RSA 可以被用來簽署及加密.\n"
+#~ "\n"
+#~ "第一把 (主要的) 金鑰一定要含有能用於簽署的金鑰."
+
+#~ msgid ""
+#~ "In general it is not a good idea to use the same key for signing and\n"
+#~ "encryption.  This algorithm should only be used in certain domains.\n"
+#~ "Please consult your security expert first."
+#~ msgstr ""
+#~ "通常來說用同一把金鑰簽署及加密並不是個好主意.\n"
+#~ "這個演算法應該祇被用於特定的情況下.\n"
+#~ "請先聯絡妳的安全專家."
+
+#~ msgid "Enter the size of the key"
+#~ msgstr "請輸入金鑰的尺寸"
+
+#~ msgid "Answer \"yes\" or \"no\""
+#~ msgstr "請回答 \"yes\" 或 \"no\""
+
+#~ msgid ""
+#~ "Enter the required value as shown in the prompt.\n"
+#~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+#~ "get a good error response - instead the system tries to interpret\n"
+#~ "the given value as an interval."
+#~ msgstr ""
+#~ "請輸入提示裡所要求的數值.\n"
+#~ "妳可以輸入 ISO 日期格式 (YYYY-MM-DD), 但是不會得到良好的錯誤回應 -\n"
+#~ "反之, 系統會試著把給定的數值中斷成若干片段."
+
+#~ msgid "Enter the name of the key holder"
+#~ msgstr "請輸入金鑰持有人的名字"
+
+#~ msgid "please enter an optional but highly suggested email address"
+#~ msgstr "請輸入選用 (但強烈建議使用) 的電子郵件位址"
+
+#~ msgid "Please enter an optional comment"
+#~ msgstr "請輸入選用的註釋"
+
+#~ msgid ""
+#~ "N  to change the name.\n"
+#~ "C  to change the comment.\n"
+#~ "E  to change the email address.\n"
+#~ "O  to continue with key generation.\n"
+#~ "Q  to to quit the key generation."
+#~ msgstr ""
+#~ "N  修改姓名.\n"
+#~ "C  修改註釋.\n"
+#~ "E  修改電子郵件位址.\n"
+#~ "O  繼續產生金鑰.\n"
+#~ "Q  中止產生金鑰."
+
+#~ msgid ""
+#~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+#~ msgstr "如果妳覺得產生子鑰可以的話, 就回答 \"yes\" (或者祇要 \"y\")."
+
+#~ 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"
+#~ "    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"
+#~ "\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"
+#~ "    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"
+#~ "    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"
+#~ "mean to you when you sign other keys.\n"
+#~ "\n"
+#~ "If you don't know what the right answer is, answer \"0\"."
+#~ msgstr ""
+#~ "當妳在某把金鑰上簽署某個使用者 ID, 妳首先必須先驗證那把\n"
+#~ "金鑰確實屬於那個使用者 ID 上叫那個名字的人. 這對那些知道\n"
+#~ "妳多小心驗證的人來說很有用.\n"
+#~ "\n"
+#~ "\"0\" 表示妳不能提出任何特別的主張來表明\n"
+#~ "    妳多仔細驗證那把金鑰\n"
+#~ "\n"
+#~ "\"1\" 表示妳相信這把金鑰屬於那個主張是主人的人,\n"
+#~ "    但是妳不能或沒有驗證那把金鑰.\n"
+#~ "    這對那些祇想要 \"個人的\" 驗證的人來說很有用,\n"
+#~ "    因為妳簽署了一把擬似匿名使用者的金鑰.\n"
+#~ "\n"
+#~ "\"2\" 表示妳真的仔細驗證了那把金鑰.\n"
+#~ "    例如說, 這能表示妳驗證了這把金鑰的指紋和\n"
+#~ "    使用者 ID, 並比對了照片 ID.\n"
+#~ "\n"
+#~ "\"3\" 表示妳真的做了大規模的驗證金鑰工作.\n"
+#~ "    例如說, 這能表示妳向金鑰持有人驗證了金鑰指紋,\n"
+#~ "    而且妳透過附帶照片而難以偽造的文件 (像是護照)\n"
+#~ "    確認了金鑰持有人的姓名與金鑰上使用者 ID 的一致,\n"
+#~ "    最後妳還 (透過電子郵件往來) 驗證了金鑰上的\n"
+#~ "    電子郵件位址確實屬於金鑰持有人.\n"
+#~ "\n"
+#~ "請注意上述關於等級 2 和 3 的例子 \"祇是\" 例子而已.\n"
+#~ "最後, 還是得由妳自己決定當妳簽署其他金鑰時,\n"
+#~ "甚麼是 \"漫不經心\", 而甚麼是 \"超級謹慎\".\n"
+#~ "\n"
+#~ "如果妳不知道應該選甚麼答案的話, 就選 \"0\"."
+
+#~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+#~ msgstr "如果妳想要簽署 *所有* 使用者 ID 的話就回答 \"yes\""
+
+#~ msgid ""
+#~ "Answer \"yes\" if you really want to delete this user ID.\n"
+#~ "All certificates are then also lost!"
+#~ msgstr ""
+#~ "如果妳真的想要刪除這個使用者 ID 的話就回答 \"yes\".\n"
+#~ "所有的憑證在那之後也都會失去!"
+
+#~ msgid "Answer \"yes\" if it is okay to delete the subkey"
+#~ msgstr "如果刪除這把子鑰沒問題的話就回答 \"yes\""
+
+#~ msgid ""
+#~ "This is a valid signature on the key; you normally don't want\n"
+#~ "to delete this signature because it may be important to establish a\n"
+#~ "trust connection to the key or another key certified by this key."
+#~ msgstr ""
+#~ "這是一份在這把金鑰上有效的簽章; 通常妳不會想要刪除這份簽章,\n"
+#~ "因為要跟別的金鑰建立起信任連結, 或由這把金鑰所簽署的金鑰憑證\n"
+#~ "會是一件相當重要的事."
+
+#~ msgid ""
+#~ "This signature can't be checked because you don't have the\n"
+#~ "corresponding key.  You should postpone its deletion until you\n"
+#~ "know which key was used because this signing key might establish\n"
+#~ "a trust connection through another already certified key."
+#~ msgstr ""
+#~ "這份簽章無法被檢驗, 因為妳沒有符合的金鑰. 妳應該延緩刪除它,\n"
+#~ "直到妳知道哪一把金鑰被使用了; 因為這把來簽署的金鑰可能透過\n"
+#~ "其他已經驗證的金鑰建立了一個信任連結."
+
+#~ msgid ""
+#~ "The signature is not valid.  It does make sense to remove it from\n"
+#~ "your keyring."
+#~ msgstr "這份簽章無效. 把它從妳的鑰匙圈裡移去相當合理."
+
+#~ 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"
+#~ "GnuPG might not be able to use this key anymore.  So do this\n"
+#~ "only if this self-signature is for some reason not valid and\n"
+#~ "a second one is available."
+#~ msgstr ""
+#~ "這是一份和這個金鑰使用者 ID 相繫的簽章. 通常\n"
+#~ "把這樣的簽章移除不會是個好點子. 事實上 GnuPG\n"
+#~ "可能從此就不能再使用這把金鑰了. 所以祇有在這\n"
+#~ "把金鑰的第一個自我簽章因某些原因無效, 而第二\n"
+#~ "個還可用的情況下纔這麼做."
+
+#~ 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 ""
+#~ "變更所有 (或祇有被選取的那幾個) 使用者 ID 的偏好成現用的偏好清單.\n"
+#~ "所有受到影響的自我簽章的時間戳記都會增加一秒鐘.\n"
+
+#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgstr "請輸入密語; 這是一個秘密的句子 \n"
+
+#~ msgid ""
+#~ "Please repeat the last passphrase, so you are sure what you typed in."
+#~ msgstr "請再次輸入最後的密語, 以確定妳到底鍵進了些甚麼."
+
+#~ msgid "Give the name of the file to which the signature applies"
+#~ msgstr "請給定簽章所要套用的檔案名稱"
+
+#~ msgid "Answer \"yes\" if it is okay to overwrite the file"
+#~ msgstr "如果覆寫這個檔案沒有問題的話就回答 \"yes\""
+
+#~ msgid ""
+#~ "Please enter a new filename. If you just hit RETURN the default\n"
+#~ "file (which is shown in brackets) will be used."
+#~ msgstr ""
+#~ "請輸入一個新的檔名. 如果妳直接按下了 Enter, 那麼\n"
+#~ "就會使用預設的檔案 (顯示在括號中)."
+
+#~ msgid ""
+#~ "You should specify a reason for the certification.  Depending on the\n"
+#~ "context you have the ability to choose from this list:\n"
+#~ "  \"Key has been compromised\"\n"
+#~ "      Use this if you have a reason to believe that unauthorized persons\n"
+#~ "      got access to your secret key.\n"
+#~ "  \"Key is superseded\"\n"
+#~ "      Use this if you have replaced this key with a newer one.\n"
+#~ "  \"Key is no longer used\"\n"
+#~ "      Use this if you have retired this key.\n"
+#~ "  \"User ID is no longer valid\"\n"
+#~ "      Use this to state that the user ID should not longer be used;\n"
+#~ "      this is normally used to mark an email address invalid.\n"
+#~ msgstr ""
+#~ "妳應該為這份憑證指定一個原因.\n"
+#~ "根據情境的不同, 妳應該可以從這個清單中選出一項:\n"
+#~ "  \"金鑰已經被洩漏了\"\n"
+#~ "      如果妳相信有某個未經許可的傢伙取得了妳的私鑰的話,\n"
+#~ "      就選這個.\n"
+#~ "  \"金鑰被代換了\"\n"
+#~ "      如果妳把妳的金鑰換成新的了, 就選這個.\n"
+#~ "  \"金鑰不再被使用了\"\n"
+#~ "      如果妳已經撤回了這把金鑰, 就選這個.\n"
+#~ "  \"使用者 ID 不再有效了\"\n"
+#~ "      如果這個使用者 ID 不再被使用了, 就選這個;\n"
+#~ "      這通常用來表示某個電子郵件位址不再有效了.\n"
+
+#~ 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 ""
+#~ "妳也可以輸入一串文字來描述為甚麼發佈這份撤銷憑證的理由.\n"
+#~ "請讓這段文字保持簡明扼要.\n"
+#~ "鍵入空白列以結束這段文字.\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
 
@@ -8137,9 +8385,6 @@ msgstr "保護摘要 %d 未被支援\n"
 #~ msgid "Enter Admin PIN: "
 #~ msgstr "請輸入管理者個人識別碼 (PIN): "
 
-#~ msgid "Enter PIN: "
-#~ msgstr "請輸入個人識別碼 (PIN): "
-
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "注意: %s 在本版中無法使用\n"
 
@@ -8153,9 +8398,6 @@ msgstr "保護摘要 %d 未被支援\n"
 #~ msgid "unknown packet type"
 #~ msgstr "未知的封包型態"
 
-#~ msgid "unknown version"
-#~ msgstr "未知的版本"
-
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "未知的公鑰演算法"
 
@@ -8264,9 +8506,6 @@ msgstr "保護摘要 %d 未被支援\n"
 #~ msgid "network error"
 #~ msgstr "網路錯誤"
 
-#~ msgid "not encrypted"
-#~ msgstr "未被加密"
-
 #~ msgid "not processed"
 #~ msgstr "未被處理"
 
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index e391adff3..aa15ec0e8 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-14  Werner Koch  <[email protected]>
+
+	* config.guess, config.sub: Update to version 2007-11-19. 
+
 2007-07-04  Werner Koch  <[email protected]>
 
 	Switched to GPLv3+.
diff --git a/scripts/config.guess b/scripts/config.guess
index 4ba338e01..7fef1a3e3 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -4,11 +4,11 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-05-17'
+timestamp='2007-11-19'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,7 +17,9 @@ timestamp='2007-05-17'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -328,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -791,7 +793,7 @@ EOF
 	exit ;;
     *:Interix*:[3456]*)
     	case ${UNAME_MACHINE} in
-	    x86) 
+	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    EM64T | authenticamd)
@@ -952,8 +954,8 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa:Linux:*:*)
-    	echo xtensa-unknown-linux-gnu
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
diff --git a/scripts/config.sub b/scripts/config.sub
index 10499a819..519046156 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-06-28'
+timestamp='2007-11-19'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -12,7 +12,7 @@ timestamp='2007-06-28'
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -21,7 +21,9 @@ timestamp='2007-06-28'
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -367,10 +369,14 @@ case $basic_machine in
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog
index 07a21357b..ca64d3e18 100644
--- a/tests/openpgp/ChangeLog
+++ b/tests/openpgp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-14  Werner Koch  <[email protected]>
+
+	* Makefile.am (./gpg_dearmor): Reverted last change because the
+	real fix is to --no-options.
+
 2007-11-22  Werner Koch  <[email protected]>
 
 	* Makefile.am (./gpg_dearmor): Add --homedir so that we don't
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 3bc6d9cb8..cf32bb9b0 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -61,7 +61,7 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
 
 ./gpg_dearmor:
 	echo '#!/bin/sh' >./gpg_dearmor
-	echo "../../g10/gpg2 --no-options --no-greeting --homedir . \
+	echo "../../g10/gpg2 --no-options --no-greeting \
              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
 	chmod 755 ./gpg_dearmor